[csw-devel] SF.net SVN: gar:[11527] csw/mgar/pkg/mairix/trunk

[skayser at users.sourceforge.net]

Revision: 11527
          http://gar.svn.sourceforge.net/gar/?rev=11527&view=rev
Author:   skayser
Date:     2010-11-08 19:11:36 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
mairix: add patch for make invocations

Modified Paths:
--------------
    csw/mgar/pkg/mairix/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch

Modified: csw/mgar/pkg/mairix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mairix/trunk/Makefile	2010-11-08 18:26:23 UTC (rev 11526)
+++ csw/mgar/pkg/mairix/trunk/Makefile	2010-11-08 19:11:36 UTC (rev 11527)
@@ -23,6 +23,11 @@
 
 RUNTIME_DEP_PKGS = CSWbzip2 CSWzlib
 
+# Let make invocations refer to $(MAKE) not "make". Otherwise gmake flags
+# might be passed to invocations of make (via $MAKEFLAGS) which make
+# doesn't understand. This particulary pertains to ~skayser/bin/mgar.
+PATCHFILES += 0001-Use-MAKE-instead-of-a-hardcoded-make.patch
+
 TEST_SCRIPTS =
 
 # configure doesn't understand most of the $(DIRPATHS) arguments

Added: csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch
===================================================================
--- csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch	                        (rev 0)
+++ csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch	2010-11-08 19:11:36 UTC (rev 11527)
@@ -0,0 +1,38 @@
+From 5f7573b82d9334486709f5fc3b5548d77b2c901e Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Mon, 8 Nov 2010 19:56:21 +0100
+Subject: [PATCH] Use $(MAKE) instead of a hardcoded make.
+
+This is to make sure that the make used for sub-invocations of the build
+process is the same as the one with which it was triggered in the first place
+(and which doesn't need to go by the name of make). On Solaris e.g. there's
+"gmake" which is the GNU make, whereas "make" is a non-GNU make which only
+implements a subset of options.
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e20182e..b8f098e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -77,14 +77,14 @@ version.h:
+ 	./mkversion
+ 
+ ./dfasyn/dfasyn:
+-	if [ -d dfasyn ]; then cd dfasyn ; make CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi
++	if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi
+ 
+ clean:
+ 	-rm -f *~ *.o mairix *.s core
+ 	-rm -f mairix.cp mairix.fn mairix.aux mairix.log mairix.ky mairix.pg mairix.toc mairix.tp mairix.vr
+ 	-rm -f fromcheck.[ch] datescan.[ch]
+ 	-rm -f nvpscan.[ch]
+-	if [ -d dfasyn ]; then cd dfasyn ; make clean ; fi
++	if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) clean ; fi
+ 
+ distclean: clean
+ 	-rm -f Makefile config.log
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.