summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-29 07:36:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-29 07:36:07 +0000
commitd45ffb58c11249942c6b06e8f1bbcb70dbf3c6dc (patch)
tree0af6cf29a005b7db96658a842dfe175be1e9c817 /Build/source
parent8b1b576afab5b7fd7f4daeb9a96ae662e4ae7e74 (diff)
Fix problems with texlinks and DESTDIR (staged install)
git-svn-id: svn://tug.org/texlive/trunk@18038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/tetex/ChangeLog9
-rw-r--r--Build/source/texk/tetex/Makefile.am9
-rw-r--r--Build/source/texk/tetex/Makefile.in7
3 files changed, 18 insertions, 7 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index fa597585d83..861fbef8856 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (run_texlinks, run_texlinks): Respect DESTDIR.
+
+2010-04-28 Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+
+ * texlinks: Append exeext to engine names.
+ * Makefile.am (run_texlinks): Invoke texlinks with explicit dir.
+
2010-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* texlinks (version): Add missing quote in svn id.
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 96db48ec8ff..238657aa00e 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/tetex/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -155,8 +155,9 @@ EXTRA_DIST += \
## 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 = $(bindir)/texlinks -v -f $(web2cdir)/fmtutil.cnf \
- -e "$(EXEEXT)" $(bindir)
+run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
+ -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+ -e "$(EXEEXT)" $(DESTDIR)$(bindir)
run-texlinks:
- PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index bc5aaa37dcb..77be8b2eb7f 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -282,8 +282,9 @@ man1_links = $(bin_links) \
EXTRA_DIST = README.a2ping README.texdoctk doc/Makefile \
doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \
updmap.pl
-run_texlinks = $(bindir)/texlinks -v -f $(web2cdir)/fmtutil.cnf \
- -e "$(EXEEXT)" $(bindir)
+run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
+ -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+ -e "$(EXEEXT)" $(DESTDIR)$(bindir)
all: all-am
@@ -875,7 +876,7 @@ uninstall-hook:
rm -f $(DESTDIR)$(man1dir)/$$link.1; \
done
run-texlinks:
- PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.