diff options
author | Karl Berry <karl@freefriends.org> | 2013-01-24 22:11:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-01-24 22:11:58 +0000 |
commit | b72657afff3b3850dce7972ebf4f3a3d379f5cc4 (patch) | |
tree | 58973abdd75aafeeb2d3456dd21154f25a165ed3 | |
parent | 6a46295c5a10b83393e113f1d17a11accab8db22 (diff) |
reporting tweaks
git-svn-id: svn://tug.org/texlive/trunk@28933 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/Makefile.in | 13 |
3 files changed, 15 insertions, 9 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index c91d9a479c9..45ab103f38f 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -3,6 +3,10 @@ * tardate.ac: Switch to 2013-01-24. * Makefile.am: Running texlinks in texk/texlive/tl_scripts. +2013-01-18 Karl Berry <karl@tug.org> + + * Build: remove use of time. + 2012-12-17 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Enable silent rules. diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index 69fe8fb41a2..dcec116f3af 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -88,18 +88,19 @@ subsubdir-conf.cmd: # 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. +texlinks_dir = texk/texlive/tl_scripts world: all ## Serialize 'make all' and 'make install-strip'. @echo "top-level make $@: running install-strip..." $(MAKE) $(AM_MAKEFLAGS) install-strip ## - @echo "top-level make $@: running texlinks in texk/texlive/tl_scripts..." - cd texk/texlive/tl_scripts && $(MAKE) $(AM_MAKEFLAGS) run-texlinks + @echo "top-level make $@: running texlinks in $(texlinks_dir) ..." + cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks ## @echo "top-level make $@: running $(check_target)..." $(MAKE) $(AM_MAKEFLAGS) $(check_target) ## - @echo "make $@ done." + @echo "top-level make $@ done." # Allow for skipping make check if needed. if cross diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 48746fd8683..84b8dea8405 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -439,6 +439,10 @@ cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent cf_silent_1 = +# 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. +texlinks_dir = texk/texlive/tl_scripts @cross_FALSE@check_target = check # Allow for skipping make check if needed. @@ -953,17 +957,14 @@ subsubdir-conf.cmd: # This is the default target for the Build script in TeX Live. .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 @echo "top-level make $@: running install-strip..." $(MAKE) $(AM_MAKEFLAGS) install-strip - @echo "top-level make $@: running texlinks in texk/texlive/tl_scripts..." - cd texk/texlive/tl_scripts && $(MAKE) $(AM_MAKEFLAGS) run-texlinks + @echo "top-level make $@: running texlinks in $(texlinks_dir) ..." + cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks @echo "top-level make $@: running $(check_target)..." $(MAKE) $(AM_MAKEFLAGS) $(check_target) - @echo "make $@ done." + @echo "top-level make $@ done." skip: .PHONY: skip |