CVS: packaging makefile,1.37.2.2,1.37.2.3

Update of /cvsroot/mspgcc/packaging
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20410/packaging

Modified Files:
      Tag: MSP430X
	makefile 
Log Message:
pass PREFIX to sub-make as environment variable


Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -w -d -r1.37.2.2 -r1.37.2.3
--- makefile	12 Feb 2009 13:50:33 -0000	1.37.2.2
+++ makefile	15 Feb 2009 21:56:47 -0000	1.37.2.3
@@ -24,9 +24,11 @@
 #
 # [email protected]
 ##############################################################################
-WINDIR=1
+#WINDIR=1
+ifdef WINDIR
 MSYSCON=1
 PWD=$(shell pwd)
+endif
 
 # mingw32 crosscompile to create mingw executables for windows targeting the msp430
 ifdef CROSS
@@ -76,6 +78,9 @@
 endif
 PREFIX          = $(INSTALLDIR)
 
+# make PREFIX available for recursive called $(MAKE)
+export PREFIX
+
 # sites where the files are downloaded from
 MIRROR_BINUTILS = ftp://sources.redhat.com/pub/binutils/releases
 #MIRROR_BINUTILS = ftp://sources.redhat.com/pub/binutils/snapshots
@@ -329,10 +334,10 @@
 	rm -rf $(BUILDDIR)/msp430-libc
 msp430-libc-build: msp430-libc-clean
 	cp -r $(CVSFILES)/msp430-libc $(BUILDDIR)
-	cd $(BUILDDIR)/msp430-libc/src && make "prefix=$(INSTALLDIR)" >$(BUILDDIR)/libc-build.log 2>&1
+	$(MAKE) -C $(BUILDDIR)/msp430-libc/src all >$(BUILDDIR)/libc-build.log 2>&1
 msp430-libc-install:
 	$(FILELIST) $(INSTALLDIR) >files-before.txt
-	cd $(BUILDDIR)/msp430-libc/src; make "prefix=$(INSTALLDIR)" install >>$(BUILDDIR)/libc-build.log 2>&1
+	$(MAKE) -C $(BUILDDIR)/msp430-libc/src install >>$(BUILDDIR)/libc-build.log 2>&1
 	$(FILELIST) $(INSTALLDIR) >files-after.txt
 	$(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-libc.txt
 	$(FILELIST_RM) files-before.txt files-after.txt
@@ -409,10 +414,10 @@
 	rm -rf $(BUILDDIR)/libraries
 	mkdir $(BUILDDIR)/libraries
 	cp -r $(CVSFILES)/libraries/* $(BUILDDIR)/libraries
-	cd $(BUILDDIR)/libraries; make >$(BUILDDIR)/libraries.log 2>&1
+	make -C $(BUILDDIR)/libraries all >$(BUILDDIR)/libraries.log 2>&1
 libraries-install:
 	$(FILELIST) $(INSTALLDIR) >files-before.txt
-	cd $(BUILDDIR)/libraries; make PREFIX=$(INSTALLDIR) install >>$(BUILDDIR)/libraries.log 2>&1
+	make -C $(BUILDDIR)/libraries install >>$(BUILDDIR)/libraries.log 2>&1
 	$(FILELIST) $(INSTALLDIR) >files-after.txt
 	$(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-libraries.txt
 	$(FILELIST_RM) files-before.txt files-after.txt
@@ -494,7 +499,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # strip executables so that they get smaller
 stripfiles:
-	@echo "## removing debun information from executables (reduce size)"
+	@echo "## removing debug information from executables (reduce size)"
 ifdef WINDOWS
 	strip $(INSTALLDIR)/bin/*.exe
 	strip $(INSTALLDIR)/msp430/bin/*.exe


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H