[Groff-commit] groff ChangeLog Makefile.in

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     11/03/30 18:08:16

Modified files:
        .              : ChangeLog Makefile.in 

Log message:
        Fix build with non-GNU make.
        
        * Makefile.in ($TARGETS): We must not pass `$MDEFINES' recursively
        down to the sub-makes started in src/libs/gnulib, because that
        directory has its own values for `$top_srcdir' etc., and overriding
        those from the command line will cause the build to fail. 
        Currently, `$MAKEOVERRIDES' will prevent the recursive passing of
        those overrides with GNU make, but not with other make(1)
        implementations.  It looks like all targets that require `$MDEFINES'
        set them explicitly anyway, so we shouldn't need to set `$MDEFINES'
        on the top level.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1295&r2=1.1296
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.114&r2=1.115

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -b -r1.1295 -r1.1296
--- ChangeLog   21 Mar 2011 21:37:53 -0000      1.1295
+++ ChangeLog   30 Mar 2011 18:08:15 -0000      1.1296
@@ -1,3 +1,17 @@
+2011-03-29  Christian Weisgerber  <address@hidden>
+
+       Fix build with non-GNU make.
+
+       * Makefile.in ($TARGETS): We must not pass `$MDEFINES' recursively
+       down to the sub-makes started in src/libs/gnulib, because that
+       directory has its own values for `$top_srcdir' etc., and overriding
+       those from the command line will cause the build to fail. 
+       Currently, `$MAKEOVERRIDES' will prevent the recursive passing of
+       those overrides with GNU make, but not with other make(1)
+       implementations.  It looks like all targets that require `$MDEFINES'
+       set them explicitly anyway, so we shouldn't need to set `$MDEFINES'
+       on the top level.
+
 2011-03-21  Jan Vcelak <address@hidden>
            Bernd Warken
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- Makefile.in 22 Mar 2011 03:01:45 -0000      1.114
+++ Makefile.in 30 Mar 2011 18:08:15 -0000      1.115
@@ -689,7 +689,7 @@
 
 
 $(TARGETS):
-       @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs)
+       @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(dodirs)
 
 dot: FORCE
        @$(ENVSETUP); \