summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-28 12:08:52 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-28 12:08:52 +0000
commitb468edd45a88e3cf4f3ec92876fb4889577a9f39 (patch)
treeb692eca7e4f6c7309ce47b22c43d5f10696dabd3
parent7cc5340a7bf0114df36f5ebe38f47d89ba3713c1 (diff)
Build system: Install the required files before running texlinks
git-svn-id: svn://tug.org/texlive/trunk@34753 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am5
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in5
2 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index f48f55e15a9..fb03c3a96b1 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -127,12 +127,13 @@ run_texlinks = $(texlinks_prog) -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
#
-run-texlinks: $(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf
+run-texlinks: $(DESTDIR)$(bindir)/texlinks
if !WIN32
PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
endif !WIN32
#
-$(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf:
+$(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
+$(DESTDIR)$(bindir)/texlinks:
$(MAKE) $(AM_MAKEFLAGS) install
##
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 273c85e9141..2de54630ab3 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -856,10 +856,11 @@ xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
.PHONY: run-texlinks
#
-run-texlinks: $(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf
+run-texlinks: $(DESTDIR)$(bindir)/texlinks
@WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
#
-$(DESTDIR)$(bindir)/texlinks $(DESTDIR)$(web2cdir)/fmtutil.cnf:
+$(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
+$(DESTDIR)$(bindir)/texlinks:
$(MAKE) $(AM_MAKEFLAGS) install
.PHONY: echo-shell-scripts