summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog5
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am22
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in6
3 files changed, 20 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 713b8b5e16e..8e2fb481f88 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-05 Karl Berry <karl@tug.org>
+
+ * Makefile.am (install-links): we want listings-ext.sh in the
+ bindir, not just listings-ext.
+
2009-08-28 Karl Berry <karl@tug.org>
* Makefile.am (nobase_dist_script_SCRIPTS): remove exatools
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 7364a24dbbb..aa3c076ca63 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -91,13 +91,13 @@ nobase_dist_script_SCRIPTS = \
## The idea is to install the scripts themselves in texmf*/scripts, and
## have bin/arch/foo be a symlink to, say,
-## ../../texmf/scripts/foo/foo.pl. 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
-## tl-w32-wrapper.texlua).
+## ../../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 (via
+## tl-w32-wrapper).
##
## The installation into texmf*/scripts is ideally done with ctan2tl.
-## The copy of the texlua wrapper for Windows is also done by hand, but
+## The copy of the wrapper for Windows is also done by hand, but
## could/should also be done by ctan2tl. The check-wrapper-consistency
## script at least checks after the fact for problems.
##
@@ -108,6 +108,7 @@ nobase_dist_script_SCRIPTS = \
## with the masters in Master/texmf*/scripts, but it will happen.
##
## We support both multiplatform and non-multiplatform builds.
+##
install-data-hook:
case "$(bindir)" in \
*/bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -116,21 +117,22 @@ install-data-hook:
exit 1;; \
esac
-## Link to the basename, removing any extension,
-## downcase for the sake of TeXcount.pl -> texcount.
+## Name the link as the basename, removing any extension,
+## except for listings-ext.sh, which is documented as that name.
+## Downcase for the sake of TeXcount.pl -> texcount.
.PHONY: install-links
install-links:
@cd $(DESTDIR)$(bindir) && \
for s in $(nobase_dist_scriptx_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- target=$$target; \
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 \
- target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- target=$$target; \
+ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
+ echo "$$s" | grep listings-ext.sh >/dev/null \
+ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
$(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 1ccf1f4e654..18d67dc0a27 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -551,14 +551,14 @@ install-links:
@cd $(DESTDIR)$(bindir) && \
for s in $(nobase_dist_scriptx_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- target=$$target; \
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 \
- target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- target=$$target; \
+ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
+ echo "$$s" | grep listings-ext.sh >/dev/null \
+ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
$(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \