summaryrefslogtreecommitdiff
path: root/Build/source/texk/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:17:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:17:38 +0000
commit307a409e5a3cc8c467bbe5d0e0fe9beacf620adf (patch)
tree77b4d4f00642c3c1c86755e63cd5d2424b058972 /Build/source/texk/am
parent54b9868277dbd900c93d8b750654b9ed43b51b26 (diff)
somewhat more general way to create symlinks for linked scripts
using build-aux/relpath git-svn-id: svn://tug.org/texlive/trunk@24137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/am')
-rw-r--r--Build/source/texk/am/script_links.am31
1 files changed, 15 insertions, 16 deletions
diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am
index a73f397ecc3..14079694336 100644
--- a/Build/source/texk/am/script_links.am
+++ b/Build/source/texk/am/script_links.am
@@ -1,4 +1,4 @@
-## texk/am/perl_links.am: Makefile fragment for perl script links.
+## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links.
##
## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
@@ -9,8 +9,8 @@
##
## requires conditionals WIN32 and WIN32_WRAP
## requires $(scriptsdir): e.g., texmf/scripts/chktex
-## appends to $(nodist_bin_SCRIPTS)
-#
+## appends to $(nodist_bin_SCRIPTS) and $(EXTRA_DIST)
+##
## install-lua-scripts requires $(lua_scripts), e.g., musixflx
## install-perl-scripts requires $(perl_scripts), e.g., deweb
## install-shell-scripts requires $(shell_scripts), e.g. htlatex
@@ -18,7 +18,7 @@
## shell_scripts are somewhat special because win32 needs
## additional .bat scripts or similar
.PHONY: install-lua-links install-perl-links install-shell-links \
- install-links make-links uninstall-links
+ install-links uninstall-links
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@@ -48,21 +48,20 @@ if !WIN32
$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
endif !WIN32
-# We support both multiplatform and non-multiplatform builds.
-install-links:
- case "$(bindir)" in \
- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- exit 1;; \
- esac
+EXTRA_DIST += ../../build-aux/relpath
-make-links:
- @cd $(DESTDIR)$(bindir) && \
+# We support native builds, multiplatform or not, as well as distro builds.
+install-links:
+ @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+ exit 1; \
+ fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+ echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+ $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
done
uninstall-links: