summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-04 16:58:08 +0000
committerKarl Berry <karl@freefriends.org>2008-05-04 16:58:08 +0000
commit0e6be6e0432864ea663f98e01e7cccc1d30b1338 (patch)
tree77e2ffb56d21d93212cf7f0bafb08061cdc52b47
parentc72d945414131fa2691af6a36e75b6837449e6e0 (diff)
move script installation to texlive/Makefile
git-svn-id: svn://tug.org/texlive/trunk@7839 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/Makefile.in61
-rw-r--r--Build/source/texk/texlive/Makefile.in64
2 files changed, 64 insertions, 61 deletions
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 23d04f07a32..6a15c3b7832 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -15,33 +15,6 @@ SCRIPTS = \
texconfig texconfig-dialog texconfig-sys texdoc \
texlinks updmap updmap-sys
-# These scripts do not exist here in /source/ at all, the instances
-# in texmf are the masters (except when it is CTAN).
-LINKSUFFIX =
-LINKED_SCRIPTS = \
- texmf/scripts/a2ping/a2ping.pl \
- texmf/scripts/epstopdf/epstopdf.pl \
- texmf/scripts/pkfix/pkfix.pl \
- texmf/scripts/ps2eps/ps2eps.pl \
- texmf/scripts/tetex/e2pall.pl \
- texmf/scripts/tetex/texdoctk.pl \
- texmf/scripts/texlive/tlmgr.tlu \
- texmf/scripts/texlive/getnonfreefonts.pl \
- texmf/scripts/texlive/tl-package-manager.pl \
- texmf-dist/scripts/glossaries/makeglossaries \
- texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \
- texmf-dist/scripts/perltex/perltex.pl \
- texmf-dist/scripts/pdfcrop/pdfcrop.pl \
- texmf-dist/scripts/pst-pdf/ps4pdf \
- texmf-dist/scripts/texcount/TeXcount.pl \
- texmf-dist/scripts/thumbpdf/thumbpdf.pl \
- texmf-dist/scripts/ppower4/ppower4.texlua \
- texmf-dist/scripts/ppower4/pdfthumb.texlua \
- texmf-dist/scripts/vpe/vpe.pl
-
-LINKED_SYS_SCRIPTS = \
- texmf/scripts/texlive/getnonfreefonts.pl
-
CONTEXTSCRIPTS = \
ctxtools exatools luatools makempy mpstools mptopdf mtxtools \
pdftools pstopdf rlxtools runtools texexec texfont texmfstart \
@@ -63,7 +36,6 @@ all: $(SCRIPTS)
default: all
install: install-data install-exec
-check:
# Auxiliary files.
install-data::
@@ -111,7 +83,7 @@ install-data::
$(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
$(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
-install-exec: install-linked-scripts install-linked-sys-scripts
+install-exec:
-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
for s in $(SCRIPTS); do \
$(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
@@ -126,36 +98,6 @@ install-exec: install-linked-scripts install-linked-sys-scripts
ln -s mktexlsr texhash
cd $(scriptdir) && rm -f mktexfmt; ln -s fmtutil mktexfmt
-# The idea here is to install the scripts themselves in texmf*/scripts,
-# and have bin/arch/foo be a symlink to, say,
-# ../../texmf/scripts/foo/foo.pl (for Perl). That way we save a bit of
-# disk space, but more importantly omit duplication, and most
-# importantly, make it possible to invoke the same Perl script on
-# Windows (via a texlua wrapper).
-#
-# The installation into texmf*/scripts is either done by hand; or via
-# ctan2tl. The texlua wrapper for Windows is also done by hand, but
-# could/should also be done by ctan2tl.
-#
-# By the way, $(scriptdir) here is the binary directory, e.g.,
-# bin/i386-linux, not the texmf*/scripts dir.
-#
-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.
- # 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:
- $(MAKE) LINKSUFFIX=-sys LINKED_SCRIPTS="$(LINKED_SYS_SCRIPTS)" \
- install-linked-scripts
-
kpse_include ../make/clean.mk
config.status: $(srcdir)/configure
@@ -165,3 +107,4 @@ Makefile: $(srcdir)/Makefile.in config.status
$(SHELL) config.status
depend:
+check:
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index d6021adc0c0..075eb494c8d 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -1,3 +1,4 @@
+# $Id$
# @configure_input@
# Makefile for texlive's extra scripts.
# Public domain.
@@ -10,6 +11,35 @@ LIVESCRIPTS = simpdftex \
ebong getnonfreefonts giftopng \
pdfthumb wordcount.sh
+# These scripts do not exist here in /source/ at all, the instances
+# in texmf are the masters (except when it is CTAN).
+LINKED_SCRIPTS = \
+ texmf/scripts/a2ping/a2ping.pl \
+ texmf/scripts/epstopdf/epstopdf.pl \
+ texmf/scripts/pkfix/pkfix.pl \
+ texmf/scripts/ps2eps/ps2eps.pl \
+ texmf/scripts/tetex/e2pall.pl \
+ texmf/scripts/tetex/texdoctk.pl \
+ texmf/scripts/texlive/tlmgr.tlu \
+ texmf/scripts/texlive/getnonfreefonts.pl \
+ texmf/scripts/texlive/tl-package-manager.pl \
+ texmf-dist/scripts/glossaries/makeglossaries \
+ texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \
+ texmf-dist/scripts/perltex/perltex.pl \
+ texmf-dist/scripts/pdfcrop/pdfcrop.pl \
+ texmf-dist/scripts/pst-pdf/ps4pdf \
+ texmf-dist/scripts/texcount/TeXcount.pl \
+ texmf-dist/scripts/thumbpdf/thumbpdf.pl \
+ texmf-dist/scripts/ppower4/ppower4.texlua \
+ texmf-dist/scripts/ppower4/pdfthumb.texlua \
+ texmf-dist/scripts/vpe/vpe.pl
+
+LINKED_SYS_SCRIPTS = \
+ texmf/scripts/texlive/getnonfreefonts.pl
+
+# overridden in the recursive call below for the sys scripts.
+LINKSUFFIX =
+
manpgs = getnonfreefonts getnonfreefonts-sys
all: $(LIVESCRIPTS)
@@ -23,7 +53,7 @@ install-data::
$(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
done
-install-exec:
+install-exec: install-linked-scripts install-linked-sys-scripts
-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
for s in $(LIVESCRIPTS); do \
rm -f $(scriptdir)/$$s ; \
@@ -32,6 +62,36 @@ install-exec:
rm -f $(scriptdir)/getnonfreefonts-sys
ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
+# The idea here is to install the scripts themselves in texmf*/scripts,
+# and have bin/arch/foo be a symlink to, say,
+# ../../texmf/scripts/foo/foo.pl (for Perl). That way we save a bit of
+# disk space, but more importantly omit duplication, and most
+# importantly, make it possible to invoke the same Perl script on
+# Windows (via a texlua wrapper).
+#
+# The installation into texmf*/scripts is either done by hand; or via
+# ctan2tl. The texlua wrapper for Windows is also done by hand, but
+# could/should also be done by ctan2tl.
+#
+# By the way, $(scriptdir) here is the binary directory, e.g.,
+# bin/i386-linux, not the texmf*/scripts dir.
+#
+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.
+ # 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:
+ $(MAKE) LINKSUFFIX=-sys LINKED_SCRIPTS="$(LINKED_SYS_SCRIPTS)" \
+ install-linked-scripts
+
kpse_include ../make/clean.mk
config.status: $(srcdir)/configure
@@ -40,5 +100,5 @@ config.status: $(srcdir)/configure
Makefile: $(srcdir)/Makefile.in config.status
$(SHELL) config.status
+depend:
check:
-