X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2FMakefile.am;h=fd1235be40dd0d4c441c3aa1e23519c9fc051cea;hb=50beb484c091b7eb9fdd4cba436757c12f316b8d;hp=e5629237e9e7af895e13c1d303a8e78d05335039;hpb=e03fcc30a8e718dc6ef4a7311afde66c03a3015c;p=mono.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e5629237e9e..fd1235be40d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,27 +1,35 @@
-EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in sqlsharp.in xsd.in wsdl.in genxs.in soapsuds.in chktrust.in signcode.in disco.in sn.in al.in cert2spc.in setreg.in makecert.in certmgr.in monop.in
+EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in sqlsharp.in xsd.in wsdl.in genxs.in soapsuds.in chktrust.in signcode.in disco.in sn.in al.in cert2spc.in setreg.in makecert.in certmgr.in monop.in gacutil.in gmcs.in mono-find-provides.in mono-find-requires.in
 
-bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop
+bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
 
-CLEANFILES = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop
+CLEANFILES = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
 
-if X86
+if USE_JIT
 MONO_INTERP = mono
 else
 MONO_INTERP = mint
 endif
 
 if PLATFORM_WIN32
-plat_bindir = $(shell cygpath -m $(bindir))
+plat_bindir = $(shell cygpath -m $(libdir))
+mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
+monO_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
 else
 plat_bindir = $(bindir)
+mono_one_instdir = $(libdir)/mono/1.0
+mono_two_instdir = $(libdir)/mono/2.0
 endif
 
 mcs: mcs.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
-	&& mv mcs.tmp mcs 
+	sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
+	&& mv mcs.tmp mcs
+
+gmcs: gmcs.in
+	sed -e 's^\@gtkdir\@^$(gtkdir)^g' -e 's^\@mono_two_instdir\@^$(mono_two_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
+	&& mv gmcs.tmp gmcs 
 
 mbas: mbas.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
+	sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
 	&& mv mbas.tmp mbas 
 
 ilasm: ilasm.in
@@ -37,7 +45,7 @@ monoresgen: monoresgen.in
 	&& mv monoresgen.tmp monoresgen
 
 resgen: resgen.in
-        sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/resgen.in > resgen.tmp \
+	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/resgen.in > resgen.tmp \
         && mv resgen.tmp resgen
 
 secutil: secutil.in
@@ -103,3 +111,15 @@ certmgr: certmgr.in
 monop: monop.in
 	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/monop.in > monop.tmp \
 	&& mv monop.tmp monop
+
+gacutil: gacutil.in
+	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gacutil.in > gacutil.tmp \
+	&& mv gacutil.tmp gacutil
+
+mono-find-provides: mono-find-provides.in
+	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mono-find-provides.in > mono-find-provides.tmp \
+	&& mv mono-find-provides.tmp mono-find-provides
+
+mono-find-requires: mono-find-requires.in
+	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mono-find-requires.in > mono-find-requires.tmp \
+	&& mv mono-find-requires.tmp mono-find-requires