summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/ChangeLog5
-rw-r--r--Build/source/texk/texlive/Makefile.in16
2 files changed, 17 insertions, 4 deletions
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index cb361536987..0283ad127f6 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-18 Karl Berry <karl@tug.org>
+
+ * Makefile.in (install-linked-scripts): change from Peter M to
+ support non-multiplatform builds.
+
2008-05-11 Norbert Preining <preining@logic.at>
* Makefile.in: add texdoc.tlu to the LINKED_SCRIPTS, it will
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index f91a08b242c..63afdc66cbf 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -78,14 +78,22 @@ install-exec: install-linked-scripts install-linked-sys-scripts
#
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.
+# - 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.
+# - the purpose of the case..esac is to support both multiplatform and
+# non-multiplatform builds.
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; \
+ case "$(scriptdir)" in \
+ */bin) s=../$$s;; \
+ */bin/*) s=../../$$s;; \
+ *) echo "$(scriptdir): strange directory for linked scripts" >&2;\
+ exit 1;; \
+ esac; \
+ ln -s $$s $$target; \
done
install-linked-sys-scripts: