CVS: packaging makefile,1.32,1.33

Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8483

Modified Files:
	makefile 
Log Message:
do not apply mingw patch under cygwin

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -d -r1.32 -r1.33
--- makefile	4 Jun 2008 02:58:26 -0000	1.32
+++ makefile	5 Jun 2008 20:41:22 -0000	1.33
@@ -65,7 +65,7 @@
 BUILDDATE      := $(shell date +%Y%m%d)
 BUILDDIR       := $(PWD)/build
 
-ifdef WINDIR
+ifdef WINDOWS
 INSTALLDIR      = $(BUILDDIR)/installed
 PREFIX          = $(shell pwd -W)/build/installed
 else
@@ -77,7 +77,7 @@
 # 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
-ifdef WINDIR
+ifdef WINDOWS
 MIRROR_GDB      = ftp://sources.redhat.com/pub/insight/snapshots/current
 else
 MIRROR_GDB      = ftp://sources.redhat.com/pub/insight/releases
@@ -91,7 +91,7 @@
 # external tools
 NSIS           := makensis
 DOWONLOAD      := wget
-ifdef WINDIR
+ifdef WINDOWS
 # file lists are used to build the windows installer
 FILELIST       := python filelist.py
 FILEDIFF       := python filediff.py
@@ -262,8 +262,11 @@
 ifdef WINDOWS
 	@echo "## Applying patch for oooooooold windoze"
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-cygwin.patch #win98 patch
+ifdef MSYSCON
+	@echo "## Applying patch for mingw build"
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-mingw.patch
 endif
+endif
 	cd $(BUILDDIR)/$(GCC); patch -p1 < $(PATCHES)/gcc-3.2.3-__FUNCTION__.patch
 	@echo "## Configuring and building msp430-gcc (this takes a while)"
 	cd $(BUILDDIR)/$(GCC) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(PREFIX) \


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php