diff options
author | Karl Berry <karl@freefriends.org> | 2014-07-26 23:14:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-07-26 23:14:02 +0000 |
commit | 66f510a2752775f10ff9b73c76c4411a66991742 (patch) | |
tree | 114b8129bf597d73e2edc995ac7ac3fe36fef09d /Build | |
parent | 0323535daa1e21c9a417b171362b62e0c3e09adc (diff) |
separate full file name for texlinks from invocation; sync other stuff
git-svn-id: svn://tug.org/texlive/trunk@34738 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/kpathsea/NEWS | 3 | ||||
-rw-r--r-- | Build/source/texk/texlive/tl_scripts/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/texlive/tl_scripts/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/texlive/tl_scripts/Makefile.in | 11 |
4 files changed, 20 insertions, 6 deletions
diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS index 9909b5aae72..9f07c014e24 100644 --- a/Build/source/texk/kpathsea/NEWS +++ b/Build/source/texk/kpathsea/NEWS @@ -1,5 +1,8 @@ This file records noteworthy changes. (Public domain.) +(for TeX Live 2015) +* kpsewhich --help outputs more information the search paths. + 6.2.0 (for TeX Live 2014) * mktexlsr outputs normal msgs to stdout instead of stderr. * do not ignore a non-terminated last line of a file. diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog index bbe3bc5e2eb..a44c1057b5f 100644 --- a/Build/source/texk/texlive/tl_scripts/ChangeLog +++ b/Build/source/texk/texlive/tl_scripts/ChangeLog @@ -1,3 +1,7 @@ +2014-07-27 Karl Berry <karl@tug.org> + + * Makefile.am (texlinks_prog): separate out from $(run_texlinks). + 2014-07-17 Karl Berry <karl@tug.org> * tcfmgr, diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index 8c3bfabd78a..a457eeffab3 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/ ## -## Copyright (C) 2013 Karl Berry <tex-live@tug.org> +## Copyright 2013-2014 Karl Berry <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## Build lists of scripts. @@ -120,9 +120,13 @@ EXTRA_DIST += updmap.help2man ## fmtutil.cnf file to use for the sake of distro builds. ## We pass along the executable extension for the sake of cygwin, so we ## don't create dangling symlinks there (even though they work). -run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ +# +texlinks_prog = $(DESTDIR)$(bindir)/texlinks +# +run_texlinks = $(texlinks_prog) -v -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \ -e "$(EXEEXT)" $(DESTDIR)$(bindir) +# run-texlinks: if !WIN32 PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks) diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index e4e042f14ef..bdc9ba12439 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -314,10 +314,10 @@ dist_texconfig_DATA = tcfmgr.map web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_DATA = fmtutil.cnf updmap_dir = $(top_srcdir)/linked_scripts/texlive -run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ - -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \ - -e "$(EXEEXT)" $(DESTDIR)$(bindir) - +# +texlinks_prog = $(DESTDIR)$(bindir)/texlinks +# +run_texlinks = $(texlinks_prog) -v all_shell_scripts = $(shell_scripts) $(sh_scripts) all: all-am @@ -852,6 +852,9 @@ xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl $(updmap_dir)/updmap.pl >/tmp/$@ .PHONY: run-texlinks + -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \ + -e "$(EXEEXT)" $(DESTDIR)$(bindir) +# run-texlinks: @WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks) |