diff options
| author | wl <wl> | 2011-03-30 18:08:15 +0000 |
|---|---|---|
| committer | wl <wl> | 2011-03-30 18:08:15 +0000 |
| commit | 9cfbda11df33635c0728eb33e04044e2e91fc681 (patch) | |
| tree | cd9ac47cee024cbb4e4b4b402ebe51d8cfe3d9d4 | |
| parent | 5ccb6344ae2525f7697a7cac8af93950dbbf7b21 (diff) | |
| download | groff-9cfbda11df33635c0728eb33e04044e2e91fc681.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,17 @@ +2011-03-29 Christian Weisgerber <naddy@mips.inka.de> + + 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 <jvcelak@redhat.com> Bernd Warken diff --git a/Makefile.in b/Makefile.in index c610d213..c6b89419 100644 --- a/Makefile.in +++ b/Makefile.in @@ -689,7 +689,7 @@ subdir=src/roff/troff $(TARGETS): - @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs) + @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(dodirs) dot: FORCE @$(ENVSETUP); \ |