summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-18 00:07:17 +0000
committerKarl Berry <karl@freefriends.org>2008-03-18 00:07:17 +0000
commit4918473ccfff07ea805bdde9e8c0254182457d25 (patch)
treef07bda6e8b9ed768f0279c10b620f8f814e8d191 /Build
parent9a14b4aedac86983ddd640e7c376bdcf09e6753d (diff)
recursive make instead of repeating rules
git-svn-id: svn://tug.org/texlive/trunk@7005 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tetex/ChangeLog7
-rw-r--r--Build/source/texk/tetex/Makefile.in23
2 files changed, 16 insertions, 14 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 6d103efd44a..7030675ac03 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-18 Karl Berry <karl@tug.org>
+
+ * Makefile.in (install-linked-scripts): use $(LINKSUFFIX).
+ (LINKSUFFIX): new variable, for passing -sys.
+ (install-linked-sys-scripts): make install-linked-scripts
+ instead of repeating code.
+
2008-03-15 Reinhard Kotucha <reinhard.kotucha@web.de>
* Makefile.in (LINKEDSCRIPTS): add pdfthumb.
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 11016c78965..f4c36fba7c7 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -16,7 +16,8 @@ SCRIPTS = \
# These scripts do not exist here in /source/ at all, the instances
# in texmf are the masters (except when it is CTAN).
-LINKEDSCRIPTS = \
+LINKSUFFIX =
+LINKED_SCRIPTS = \
texmf/scripts/a2ping/a2ping.pl \
texmf/scripts/epstopdf/epstopdf.pl \
texmf/scripts/pdfcrop/pdfcrop.pl \
@@ -103,7 +104,7 @@ install-data::
$(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
$(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
-install-exec: install-linkedscripts install-linked-sys-scripts
+install-exec: install-linked-scripts install-linked-sys-scripts
-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
for s in $(SCRIPTS); do \
$(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
@@ -132,27 +133,21 @@ install-exec: install-linkedscripts install-linked-sys-scripts
# By the way, $(scriptdir) here is the binary directory, e.g.,
# bin/i386-linux, not the texmf*/scripts dir.
#
-install-linkedscripts:
+install-linked-scripts:
-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
# link to the basename, removing any extension, of the source.
# we downcase for the sake of TeXcount.pl -> texcount.
- for s in $(LINKEDSCRIPTS); do \
+ # LINKSUFFIX is for -sys, see next target.
+ for s in $(LINKED_SCRIPTS); do \
target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr A-Z a-z`; \
+ target=$$target$(LINKSUFFIX); \
rm -f $$target; \
ln -s ../../$$s $$target; \
done
install-linked-sys-scripts:
- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
- # link to the basename, removing any extension, of the source,
- # and append -sys to the file name.
- # we downcase for the sake of TeXcount.pl -> texcount-sys.
- for s in $(LINKED_SYS_SCRIPTS); do \
- target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr A-Z a-z`; \
- target="$target-sys" \
- rm -f $$target; \
- ln -s ../../$$s $$target; \
- done
+ $(MAKE) LINKSUFFIX=-sys LINKED_SCRIPTS="$(LINKED_SYS_SCRIPTS)" \
+ install-linked-scripts
kpse_include ../make/clean.mk