summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-23 14:50:23 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-23 14:50:23 +0000
commit07b92c66a2761278da0d1ed0c2fdf62d7eeb2d85 (patch)
tree2dbfd46f0f703e34b6e8dfb15b18edef835de0fa /Build
parent24eb4f9306f8b19b5564853d41514078f071e849 (diff)
WIN32: install wrapper binaries instead of symlinks
git-svn-id: svn://tug.org/texlive/trunk@20838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tex4htk/ChangeLog2
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog6
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am70
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in212
4 files changed, 168 insertions, 122 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index 458f435ae71..bfcb837b6e3 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,6 +1,6 @@
2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
- * Makefile.am, configure.ac [WIN32]: Install wrapper scripts
+ * Makefile.am, configure.ac [WIN32]: Install wrapper binaries
instead of symlinks to scripts under texmf-dist/scripts/.
2010-12-20 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 658adbfdd8c..49ced7b97eb 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Distinguish shell and perl (or lus, ...) scripts.
+ [WIN32]: Skip symlinks from bindir to texmf*/scripts/; install
+ wrapper binaries for perl scripts.
+
2010-05-30 Karl Berry <karl@tug.org>
* Makefile.am (nobase_dist_script_SCRIPTS): remove context scripts.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index da91f8e6037..4738301d861 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -13,24 +13,45 @@ bin_SCRIPTS =
# dangling symlinks produced by `make install'.
# The instances in texmf* are the masters (except when it is CTAN).
#
-scriptxdir = ${prefix}/texmf/scripts
-nobase_dist_scriptx_SCRIPTS = \
+texmf_scriptsdir = ${prefix}/texmf/scripts
+## We distinguish shell and perl (or lua, python, ruby, ...) scripts.
+texmf_shell_scripts = \
+ simpdftex/simpdftex
+texmf_perl_scripts = \
a2ping/a2ping.pl \
- simpdftex/simpdftex \
tetex/e2pall.pl \
tetex/texdoctk.pl \
texdoc/texdoc.tlu \
texlive/rungs.tlu \
texlive/tlmgr.pl
+nobase_dist_texmf_scripts_SCRIPTS = \
+ $(texmf_shell_scripts) \
+ $(texmf_perl_scripts)
-scriptdir = ${prefix}/texmf-dist/scripts
-nobase_dist_script_SCRIPTS = \
+texmf_dist_scriptsdir = ${prefix}/texmf-dist/scripts
+texmf_dist_shell_scripts = \
+ bibexport/bibexport.sh \
+ installfont/installfont-tl \
+ listings-ext/listings-ext.sh \
+ pdfjam/pdf180 \
+ pdfjam/pdf270 \
+ pdfjam/pdf90 \
+ pdfjam/pdfbook \
+ pdfjam/pdfflip \
+ pdfjam/pdfjam \
+ pdfjam/pdfjam-pocketmod \
+ pdfjam/pdfjam-slides3up \
+ pdfjam/pdfjam-slides6up \
+ pdfjam/pdfjoin \
+ pdfjam/pdfnup \
+ pdfjam/pdfpun \
+ pst-pdf/ps4pdf
+texmf_dist_perl_scripts = \
accfonts/mkt1font \
accfonts/vpl2ovp \
accfonts/vpl2vpl \
authorindex/authorindex \
bengali/ebong.py \
- bibexport/bibexport.sh \
bundledoc/arlatex \
bundledoc/bundledoc \
cachepic/cachepic.tlu \
@@ -51,38 +72,23 @@ nobase_dist_script_SCRIPTS = \
fontools/showglyphs \
fragmaster/fragmaster.pl \
glossaries/makeglossaries \
- installfont/installfont-tl \
latex2man/latex2man \
latexdiff/latexdiff.pl \
latexdiff/latexdiff-vc.pl \
latexdiff/latexrevise.pl \
latexmk/latexmk.pl \
luaotfload/mkluatexfontdb.lua \
- listings-ext/listings-ext.sh \
mathspic/mathspic.pl \
mkjobtexmf/mkjobtexmf.pl \
mkgrkindex/mkgrkindex \
oberdiek/pdfatfi.pl \
pax/pdfannotextractor.pl \
pdfcrop/pdfcrop.pl \
- pdfjam/pdf180 \
- pdfjam/pdf270 \
- pdfjam/pdf90 \
- pdfjam/pdfbook \
- pdfjam/pdfflip \
- pdfjam/pdfjam \
- pdfjam/pdfjam-pocketmod \
- pdfjam/pdfjam-slides3up \
- pdfjam/pdfjam-slides6up \
- pdfjam/pdfjoin \
- pdfjam/pdfnup \
- pdfjam/pdfpun \
perltex/perltex.pl \
pkfix/pkfix.pl \
pkfix-helper/pkfix-helper \
ppower4/pdfthumb.tlu \
ppower4/ppower4.tlu \
- pst-pdf/ps4pdf \
pst2pdf/pst2pdf \
purifyeps/purifyeps \
splitindex/perl/splitindex.pl \
@@ -94,6 +100,9 @@ nobase_dist_script_SCRIPTS = \
thumbpdf/thumbpdf.pl \
ulqda/ulqda.pl \
vpe/vpe.pl
+nobase_dist_texmf_dist_scripts_SCRIPTS = \
+ $(texmf_dist_shell_scripts) \
+ $(texmf_dist_perl_scripts)
# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
bin_links = \
@@ -120,13 +129,22 @@ bin_links = \
#
# We support both multiplatform and non-multiplatform builds.
#
+runscript = $(top_srcdir)/w32_wrapper/runscript.exe
install-data-hook:
+if WIN32
+ @for s in $(texmf_perl_scripts) $(texmf_dist_perl_scripts); do \
+ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
+ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
+ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
+ done
+else !WIN32
case "$(bindir)" in \
*/bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
*/bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
*) echo "strange directory '$(bindir)' for linked scripts" >&2; \
exit 1;; \
esac
+endif !WIN32
## Name the link as the basename, removing any extension,
## except for listings-ext.sh, which is documented as that name.
@@ -134,13 +152,13 @@ install-data-hook:
.PHONY: install-links
install-links:
@cd $(DESTDIR)$(bindir) && \
- for s in $(nobase_dist_scriptx_SCRIPTS); do \
+ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
$(LN_S) $(REL)/texmf/scripts/$$s $$target; \
done && \
- for s in $(nobase_dist_script_SCRIPTS); do \
+ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
@@ -163,15 +181,17 @@ install-links:
## man dir link for those mans which can use it.
uninstall-hook:
- @for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
+ @for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
- rm -f $(DESTDIR)$(bindir)/$$target; \
+ rm -f $(DESTDIR)$(bindir)/$$target$(EXEEXT); \
done
+if !WIN32
@for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
rm -f $(DESTDIR)$(bindir)/$$link; \
done
rm -f $(DESTDIR)$(bindir)/man
+endif !WIN32
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 14a47db7b24..8e6fff9d007 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -33,8 +33,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = linked_scripts
-DIST_COMMON = $(nobase_dist_script_SCRIPTS) \
- $(nobase_dist_scriptx_SCRIPTS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
+ $(nobase_dist_texmf_scripts_SCRIPTS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
@@ -65,10 +65,11 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptdir)" \
- "$(DESTDIR)$(scriptxdir)"
-SCRIPTS = $(bin_SCRIPTS) $(nobase_dist_script_SCRIPTS) \
- $(nobase_dist_scriptx_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(texmf_dist_scriptsdir)" \
+ "$(DESTDIR)$(texmf_scriptsdir)"
+SCRIPTS = $(bin_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
+ $(nobase_dist_texmf_scripts_SCRIPTS)
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,24 +164,47 @@ bin_SCRIPTS =
# dangling symlinks produced by `make install'.
# The instances in texmf* are the masters (except when it is CTAN).
#
-scriptxdir = ${prefix}/texmf/scripts
-nobase_dist_scriptx_SCRIPTS = \
+texmf_scriptsdir = ${prefix}/texmf/scripts
+texmf_shell_scripts = \
+ simpdftex/simpdftex
+
+texmf_perl_scripts = \
a2ping/a2ping.pl \
- simpdftex/simpdftex \
tetex/e2pall.pl \
tetex/texdoctk.pl \
texdoc/texdoc.tlu \
texlive/rungs.tlu \
texlive/tlmgr.pl
-scriptdir = ${prefix}/texmf-dist/scripts
-nobase_dist_script_SCRIPTS = \
+nobase_dist_texmf_scripts_SCRIPTS = \
+ $(texmf_shell_scripts) \
+ $(texmf_perl_scripts)
+
+texmf_dist_scriptsdir = ${prefix}/texmf-dist/scripts
+texmf_dist_shell_scripts = \
+ bibexport/bibexport.sh \
+ installfont/installfont-tl \
+ listings-ext/listings-ext.sh \
+ pdfjam/pdf180 \
+ pdfjam/pdf270 \
+ pdfjam/pdf90 \
+ pdfjam/pdfbook \
+ pdfjam/pdfflip \
+ pdfjam/pdfjam \
+ pdfjam/pdfjam-pocketmod \
+ pdfjam/pdfjam-slides3up \
+ pdfjam/pdfjam-slides6up \
+ pdfjam/pdfjoin \
+ pdfjam/pdfnup \
+ pdfjam/pdfpun \
+ pst-pdf/ps4pdf
+
+texmf_dist_perl_scripts = \
accfonts/mkt1font \
accfonts/vpl2ovp \
accfonts/vpl2vpl \
authorindex/authorindex \
bengali/ebong.py \
- bibexport/bibexport.sh \
bundledoc/arlatex \
bundledoc/bundledoc \
cachepic/cachepic.tlu \
@@ -201,38 +225,23 @@ nobase_dist_script_SCRIPTS = \
fontools/showglyphs \
fragmaster/fragmaster.pl \
glossaries/makeglossaries \
- installfont/installfont-tl \
latex2man/latex2man \
latexdiff/latexdiff.pl \
latexdiff/latexdiff-vc.pl \
latexdiff/latexrevise.pl \
latexmk/latexmk.pl \
luaotfload/mkluatexfontdb.lua \
- listings-ext/listings-ext.sh \
mathspic/mathspic.pl \
mkjobtexmf/mkjobtexmf.pl \
mkgrkindex/mkgrkindex \
oberdiek/pdfatfi.pl \
pax/pdfannotextractor.pl \
pdfcrop/pdfcrop.pl \
- pdfjam/pdf180 \
- pdfjam/pdf270 \
- pdfjam/pdf90 \
- pdfjam/pdfbook \
- pdfjam/pdfflip \
- pdfjam/pdfjam \
- pdfjam/pdfjam-pocketmod \
- pdfjam/pdfjam-slides3up \
- pdfjam/pdfjam-slides6up \
- pdfjam/pdfjoin \
- pdfjam/pdfnup \
- pdfjam/pdfpun \
perltex/perltex.pl \
pkfix/pkfix.pl \
pkfix-helper/pkfix-helper \
ppower4/pdfthumb.tlu \
ppower4/ppower4.tlu \
- pst-pdf/ps4pdf \
pst2pdf/pst2pdf \
purifyeps/purifyeps \
splitindex/perl/splitindex.pl \
@@ -245,12 +254,38 @@ nobase_dist_script_SCRIPTS = \
ulqda/ulqda.pl \
vpe/vpe.pl
+nobase_dist_texmf_dist_scripts_SCRIPTS = \
+ $(texmf_dist_shell_scripts) \
+ $(texmf_dist_perl_scripts)
+
# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
bin_links = \
epstopdf:repstopdf \
pdfcrop:rpdfcrop
+
+# The idea is to install the scripts themselves in texmf*/scripts, and
+# have bin/arch/foo be a symlink to, say,
+# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
+# space, but much more importantly omit duplication, and most
+# importantly of all make it possible to invoke the same Perl script on
+# Windows (see ../w32_wrapper).
+#
+# The installation into texmf*/scripts is ideally done with ctan2tl.
+# The copy of the wrapper for Windows is done by hand, but (todo)
+# could/should also be done by ctan2tl. The check-wrapper-consistency
+# script at least checks after the fact for problems.
+#
+# We also keep a copy of all the scripts here and install into the runtime.
+# This is purely for other distro builders, so symlinks are not dangling in
+# the inst/bin dir (it is meaningless in native TL). We have not yet
+# written the auto-update to ensure linked_scripts is actually up to date
+# with the masters in Master/texmf*/scripts, but one day.
+#
+# We support both multiplatform and non-multiplatform builds.
+#
+runscript = $(top_srcdir)/w32_wrapper/runscript.exe
all: all-am
.SUFFIXES:
@@ -318,10 +353,10 @@ uninstall-binSCRIPTS:
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
-install-nobase_dist_scriptSCRIPTS: $(nobase_dist_script_SCRIPTS)
+install-nobase_dist_texmf_dist_scriptsSCRIPTS: $(nobase_dist_texmf_dist_scripts_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
- @list='$(nobase_dist_script_SCRIPTS)'; test -n "$(scriptdir)" || list=; \
+ test -z "$(texmf_dist_scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(texmf_dist_scriptsdir)"
+ @list='$(nobase_dist_texmf_dist_scripts_SCRIPTS)'; test -n "$(texmf_dist_scriptsdir)" || list=; \
$(am__nobase_strip_setup); \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -339,30 +374,30 @@ install-nobase_dist_scriptSCRIPTS: $(nobase_dist_script_SCRIPTS)
END { for (d in files) print "f", d, files[d] }' | \
while read type dir files; do \
case $$type in \
- d) echo " $(MKDIR_P) '$(DESTDIR)$(scriptdir)/$$dir'"; \
- $(MKDIR_P) "$(DESTDIR)$(scriptdir)/$$dir" || exit $$?;; \
+ d) echo " $(MKDIR_P) '$(DESTDIR)$(texmf_dist_scriptsdir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(texmf_dist_scriptsdir)/$$dir" || exit $$?;; \
f) \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scriptdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scriptdir)$$dir" || exit $$?; \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmf_dist_scriptsdir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmf_dist_scriptsdir)$$dir" || exit $$?; \
} \
;; esac \
; done
-uninstall-nobase_dist_scriptSCRIPTS:
+uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(nobase_dist_script_SCRIPTS)'; test -n "$(scriptdir)" || exit 0; \
+ @list='$(nobase_dist_texmf_dist_scripts_SCRIPTS)'; test -n "$(texmf_dist_scriptsdir)" || exit 0; \
$(am__nobase_strip_setup); \
files=`$(am__nobase_strip) \
-e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \
test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(scriptdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(scriptdir)" && rm -f $$files
-install-nobase_dist_scriptxSCRIPTS: $(nobase_dist_scriptx_SCRIPTS)
+ echo " ( cd '$(DESTDIR)$(texmf_dist_scriptsdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(texmf_dist_scriptsdir)" && rm -f $$files
+install-nobase_dist_texmf_scriptsSCRIPTS: $(nobase_dist_texmf_scripts_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(scriptxdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptxdir)"
- @list='$(nobase_dist_scriptx_SCRIPTS)'; test -n "$(scriptxdir)" || list=; \
+ test -z "$(texmf_scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(texmf_scriptsdir)"
+ @list='$(nobase_dist_texmf_scripts_SCRIPTS)'; test -n "$(texmf_scriptsdir)" || list=; \
$(am__nobase_strip_setup); \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -380,26 +415,26 @@ install-nobase_dist_scriptxSCRIPTS: $(nobase_dist_scriptx_SCRIPTS)
END { for (d in files) print "f", d, files[d] }' | \
while read type dir files; do \
case $$type in \
- d) echo " $(MKDIR_P) '$(DESTDIR)$(scriptxdir)/$$dir'"; \
- $(MKDIR_P) "$(DESTDIR)$(scriptxdir)/$$dir" || exit $$?;; \
+ d) echo " $(MKDIR_P) '$(DESTDIR)$(texmf_scriptsdir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(texmf_scriptsdir)/$$dir" || exit $$?;; \
f) \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scriptxdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scriptxdir)$$dir" || exit $$?; \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmf_scriptsdir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmf_scriptsdir)$$dir" || exit $$?; \
} \
;; esac \
; done
-uninstall-nobase_dist_scriptxSCRIPTS:
+uninstall-nobase_dist_texmf_scriptsSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(nobase_dist_scriptx_SCRIPTS)'; test -n "$(scriptxdir)" || exit 0; \
+ @list='$(nobase_dist_texmf_scripts_SCRIPTS)'; test -n "$(texmf_scriptsdir)" || exit 0; \
$(am__nobase_strip_setup); \
files=`$(am__nobase_strip) \
-e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \
test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(scriptxdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(scriptxdir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(texmf_scriptsdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(texmf_scriptsdir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -441,7 +476,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(scriptxdir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmf_dist_scriptsdir)" "$(DESTDIR)$(texmf_scriptsdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -489,8 +524,8 @@ info: info-am
info-am:
-install-data-am: install-nobase_dist_scriptSCRIPTS \
- install-nobase_dist_scriptxSCRIPTS
+install-data-am: install-nobase_dist_texmf_dist_scriptsSCRIPTS \
+ install-nobase_dist_texmf_scriptsSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-am
@@ -535,8 +570,9 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binSCRIPTS uninstall-nobase_dist_scriptSCRIPTS \
- uninstall-nobase_dist_scriptxSCRIPTS
+uninstall-am: uninstall-binSCRIPTS \
+ uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS \
+ uninstall-nobase_dist_texmf_scriptsSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: install-am install-data-am install-strip uninstall-am
@@ -547,54 +583,38 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nobase_dist_scriptSCRIPTS \
install-data-am install-data-hook install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
- install-nobase_dist_scriptSCRIPTS \
- install-nobase_dist_scriptxSCRIPTS install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-nobase_dist_texmf_dist_scriptsSCRIPTS \
+ install-nobase_dist_texmf_scriptsSCRIPTS install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
- uninstall-hook uninstall-nobase_dist_scriptSCRIPTS \
- uninstall-nobase_dist_scriptxSCRIPTS
-
+ uninstall-hook uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS \
+ uninstall-nobase_dist_texmf_scriptsSCRIPTS
-# The idea is to install the scripts themselves in texmf*/scripts, and
-# have bin/arch/foo be a symlink to, say,
-# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
-# space, but much more importantly omit duplication, and most
-# importantly of all make it possible to invoke the same Perl script on
-# Windows (see ../w32_wrapper).
-#
-# The installation into texmf*/scripts is ideally done with ctan2tl.
-# The copy of the wrapper for Windows is done by hand, but (todo)
-# could/should also be done by ctan2tl. The check-wrapper-consistency
-# script at least checks after the fact for problems.
-#
-# We also keep a copy of all the scripts here and install into the runtime.
-# This is purely for other distro builders, so symlinks are not dangling in
-# the inst/bin dir (it is meaningless in native TL). We have not yet
-# written the auto-update to ensure linked_scripts is actually up to date
-# with the masters in Master/texmf*/scripts, but one day.
-#
-# We support both multiplatform and non-multiplatform builds.
-#
install-data-hook:
- case "$(bindir)" in \
- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
- exit 1;; \
- esac
+@WIN32_TRUE@ @for s in $(texmf_perl_scripts) $(texmf_dist_perl_scripts); do \
+@WIN32_TRUE@ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
+@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
+@WIN32_TRUE@ done
+@WIN32_FALSE@ case "$(bindir)" in \
+@WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@WIN32_FALSE@ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+@WIN32_FALSE@ exit 1;; \
+@WIN32_FALSE@ esac
.PHONY: install-links
install-links:
@cd $(DESTDIR)$(bindir) && \
- for s in $(nobase_dist_scriptx_SCRIPTS); do \
+ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
$(LN_S) $(REL)/texmf/scripts/$$s $$target; \
done && \
- for s in $(nobase_dist_script_SCRIPTS); do \
+ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
@@ -616,17 +636,17 @@ install-links:
else :; fi
uninstall-hook:
- @for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
+ @for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
- rm -f $(DESTDIR)$(bindir)/$$target; \
- done
- @for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- rm -f $(DESTDIR)$(bindir)/$$link; \
+ rm -f $(DESTDIR)$(bindir)/$$target$(EXEEXT); \
done
- rm -f $(DESTDIR)$(bindir)/man
+@WIN32_FALSE@ @for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@ done
+@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/man
# 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.