diff options
| -rw-r--r-- | Build/source/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/Makefile.am | 9 | ||||
| -rw-r--r-- | Build/source/Makefile.in | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 71e9df79448..be5419b2682 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,4 +1,8 @@ -2008-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> +2009-05-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (world): serialize to avoid parallel build problems. + +2009-05-21 Peter Breitenlohner <peb@mppmu.mpg.de> * Build (TL_CONF_MAC_FONTS, TL_CONF_XINDY): removed, no longer required. diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index 61e2594ae2c..bdb2dddc7d2 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -32,11 +32,14 @@ endif !build_kpathsea SUBDIRS += libs utils texk # This is the default target for the Build script in TeX Live. -# -# run texlinks here since the binaries won't be there +.PHONY: world +# Run texlinks here since the binaries won't be there # at install-data, and fmtutil.cnf won't be there at install-exec, # and there is no install-hook or install-local. -world: all install-strip +world: all +## Serialize 'make all' and 'make install-strip'. + $(MAKE) $(AM_MAKEFLAGS) install-strip +## echo "top-level make $@: running texlinks ..." cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks ## diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index e2a5201244f..b1f37381c13 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -731,11 +731,12 @@ dist-hook: rm -rf `find $(distdir) -name .svn` # This is the default target for the Build script in TeX Live. -# -# run texlinks here since the binaries won't be there +.PHONY: world +# Run texlinks here since the binaries won't be there # at install-data, and fmtutil.cnf won't be there at install-exec, # and there is no install-hook or install-local. -world: all install-strip +world: all + $(MAKE) $(AM_MAKEFLAGS) install-strip echo "top-level make $@: running texlinks ..." cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks @echo "make $@ done." |