**** Merged from MCS ****

[mono.git] / mcs / gmcs / Makefile

diff --git a/mcs/gmcs/Makefile b/mcs/gmcs/Makefile
index d88614fa5147ddf79c2d4d46744d0ebc47f2ae78..c2128d98273ce71d6c272d6e8d2e42d35a7829bf 100644 (file)
--- a/mcs/gmcs/Makefile
+++ b/mcs/gmcs/Makefile
@@ -53,8 +53,8 @@ DISTFILES = \
 all-local: gmcs.exe
 
 install-local: gmcs.exe
-       $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
-       $(INSTALL_BIN) gmcs.exe $(DESTDIR)$(prefix)/bin
+       $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib/mono/2.0
+       $(INSTALL_BIN) gmcs.exe $(DESTDIR)$(prefix)/lib/mono/2.0
 
 uninstall-local:
        -rm -f $(DESTDIR)$(prefix)/bin/mcs.exe
@@ -67,10 +67,13 @@ clean-local:
 dist-local: dist-default
 
 gmcs.exe: $(all_sources)
-       MONO_PATH="../class/lib/net_2_0:$(MONO_PATH)" $(BOOT_COMPILE) /target:exe /out:$@ $^
+       MONO_PATH="../class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" mono ../mcs/mcs.exe -2 /target:exe /debug /define:MCS_DEBUG /out:$@ $^
+
+gmcs2.exe: $(all_sources)
+       MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" mcs -2 /target:exe /debug /define:MCS_DEBUG /out:$@ $^
 
 cs-parser.cs: cs-parser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $< > jay-tmp.out && mv jay-tmp.out $@
 
 # Testing targets
 
@@ -92,7 +95,7 @@ wc:
        wc -l $(all_sources)
 
 ctest: 
-       -rm mcs2.exe mcs3.exe
+       rm -f mcs2.exe mcs3.exe
        make btest USE_MCS_FLAGS= 
 
 # we need this because bash tries to use its own crappy timer