summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-28 12:01:03 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-28 12:01:03 +0000
commit7cc5340a7bf0114df36f5ebe38f47d89ba3713c1 (patch)
tree426cd47205938715df7788116c560fa7cde5c474 /Build
parente504bf303ee07a1b40aeccadcf5c38ea45e234c6 (diff)
Build system: Install the required files before running texlinks
git-svn-id: svn://tug.org/texlive/trunk@34752 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/tl_scripts/ChangeLog4
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am6
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in5
3 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index a44c1057b5f..4fc944e3bc0 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (run-texlinks): Install the required files.
+
2014-07-27 Karl Berry <karl@tug.org>
* Makefile.am (texlinks_prog): separate out from $(run_texlinks).
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index cafa3fa2347..f48f55e15a9 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -127,11 +127,13 @@ run_texlinks = $(texlinks_prog) -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
#
-run-texlinks:
+run-texlinks: $(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf
if !WIN32
PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
endif !WIN32
-
+#
+$(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf:
+ $(MAKE) $(AM_MAKEFLAGS) install
##
## This target is invoked by check-wrapper-consistency (run from cron).
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 0f203718a1a..273c85e9141 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -856,8 +856,11 @@ xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
.PHONY: run-texlinks
#
-run-texlinks:
+run-texlinks: $(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf
@WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+#
+$(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf:
+ $(MAKE) $(AM_MAKEFLAGS) install
.PHONY: echo-shell-scripts
echo-shell-scripts: