2005-01-11 Peter Bartok <pbartok@novell.com>

[mono.git] / mcs / build / rules.make

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 6c0d1a8e6582479c97b183c673b3d651a1a59747..470856e88c0abcfb3d3c3370223d2d5258806d7b 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -26,11 +26,11 @@ INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_BIN = $(INSTALL) -m 755
 INSTALL_LIB = $(INSTALL_BIN)
 MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
-INTERNAL_MCS = $(RUNTIME) $(topdir)/mcs/mcs.exe
+INTERNAL_MCS = $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mcs.exe
 INTERNAL_MBAS = $(RUNTIME) $(topdir)/mbas/mbas.exe
 INTERNAL_GMCS = $(RUNTIME) $(topdir)/gmcs/gmcs.exe
 INTERNAL_ILASM = $(RUNTIME) $(topdir)/ilasm/ilasm.exe
-INTERNAL_RESGEN = $(RUNTIME) $(topdir)/monoresgen/monoresgen.exe
+INTERNAL_RESGEN = $(RUNTIME) $(topdir)/tools/resgen/resgen.exe
 corlib = mscorlib.dll
 
 depsdir = $(topdir)/build/deps
@@ -118,12 +118,13 @@ PROFILE_SUBDIRS = $(SUBDIRS)
 endif
 
 %-recursive:
-       @set . $$MAKEFLAGS; \
+       @set . $$MAKEFLAGS; final_exit=:; \
        case $$2 in --unix) shift ;; esac; \
        case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
        list='$(PROFILE_SUBDIRS)'; for d in $$list ; do \
-           (cd $$d && $(MAKE) $*) || $$dk ; \
-       done
+           (cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
+       done; \
+       $$final_exit
 
 ifndef DIST_SUBDIRS
 DIST_SUBDIRS = $(SUBDIRS) $(DIST_ONLY_SUBDIRS)
@@ -151,7 +152,7 @@ dist-default:
        if test -f GNUmakefile; then m=GNUm; fi; \
        for f in $${m}akefile $(DISTFILES) ; do \
            dest=`dirname $(distdir)/$$f` ; \
-           $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
+           $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
        done
 
 # Useful