patch for devel/imake-4

Harti Brandt brandt at fokus.fraunhofer.de
Mon Mar 22 03:28:10 PST 2004


Hi,

I'm about to commit the patch in standards/57295 that makes make more
POSIX compliant. Unfortunately this breaks imake-4 build. The reason is
that the imake-4 makefile expects to be able to override the top-level's
Makefile SUBDIR variable by specifying it on make's command line. This
won't work with a POSIX make, because a POSIX make passes command line
variable assignments down to all sub-makes and they cannot be overridden
by the makefile. The simples patch for the problem is to actually patch
the top-level Imakefile to change the SUBDIR variable. Patch attached.

harti
-------------- next part --------------
diff -urN --exclude=CVS imake-4.orig/files/patch-Imakefile imake-4/files/patch-Imakefile
--- imake-4.orig/files/patch-Imakefile	Thu Jan  1 01:00:00 1970
+++ imake-4/files/patch-Imakefile	Sat Mar 20 19:54:22 2004
@@ -0,0 +1,12 @@
+--- ../Imakefile.orig	Sat Mar 20 19:40:17 2004
++++ ../Imakefile	Sat Mar 20 19:24:03 2004
+@@ -30,8 +30,7 @@
+ #endif
+ #endif
+ 
+-        SUBDIRS = include config lib $(NLSSUBDIR) \
+-                  programs $(FONTSDIR) $(DOCSDIR)
++        SUBDIRS = include config
+   LNINSTALLDIRS = lib
+ 
+ #if HasParallelMake
diff -urN --exclude=CVS imake-4.orig/scripts/configure imake-4/scripts/configure
--- imake-4.orig/scripts/configure	Wed Mar 12 00:38:11 2003
+++ imake-4/scripts/configure	Sat Mar 20 19:23:38 2004
@@ -58,4 +58,4 @@
 touch config/cf/version.def
 touch config/cf/date.def
 make Makefile.boot
-make -f xmakefile SUBDIRS="include config" VerifyOS version.def Makefiles includes
+make -f xmakefile VerifyOS version.def Makefiles includes


More information about the freebsd-x11 mailing list