CVS: packaging makefile,1.37.2.3,1.37.2.4

"Sergey A. Borshch" <[email protected]> Sun, 15 Feb 2009 23:41:09 +0000
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/packaging
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27060/packaging

Modified Files:
      Tag: MSP430X
	makefile 
Log Message:
automaticc MINGW buil recognition


Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -w -d -r1.37.2.3 -r1.37.2.4
--- makefile	15 Feb 2009 21:56:47 -0000	1.37.2.3
+++ makefile	15 Feb 2009 23:41:07 -0000	1.37.2.4
@@ -24,11 +24,14 @@
 #
 # [email protected]
 ##############################################################################
-#WINDIR=1
-ifdef WINDIR
+ifeq (MINGW, $(findstring MINGW, $(shell uname)))
 MSYSCON=1
+WINDIR=1
+ifndef PWD  
+# if building from commandline, not from msys shell, PWD is not set.
 PWD=$(shell pwd)
 endif
+endif
 
 # mingw32 crosscompile to create mingw executables for windows targeting the msp430
 ifdef CROSS
@@ -148,6 +151,8 @@
 	@echo "    working PATH is set to '$(PATH)'"
 	@echo ""
 	@echo "    Versions: $(BINUTILS) $(GCC) gdb-$(GDB_VERSION)"
+	@echo "    PWD: $(PWD)"
+	@echo "    WINDIR: $(WINDIR)"
 
 debug:
 	@echo BUILDDATE = $(BUILDDATE)
@@ -414,10 +419,10 @@
 	rm -rf $(BUILDDIR)/libraries
 	mkdir $(BUILDDIR)/libraries
 	cp -r $(CVSFILES)/libraries/* $(BUILDDIR)/libraries
-	make -C $(BUILDDIR)/libraries all >$(BUILDDIR)/libraries.log 2>&1
+	$(MAKE) -C $(BUILDDIR)/libraries all >$(BUILDDIR)/libraries.log 2>&1
 libraries-install:
 	$(FILELIST) $(INSTALLDIR) >files-before.txt
-	make -C $(BUILDDIR)/libraries 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


------------------------------------------------------------------------------
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