summaryrefslogtreecommitdiff
path: root/Build/source/texk/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-24 12:40:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-24 12:40:04 +0000
commita277fb9303587330b65a7081c637a1aa651c9d9a (patch)
tree71c581dce3a501f808104d58256b92c1fa04abc7 /Build/source/texk/am
parent100038fd15e08e73a1c3f7e0b834803e92cb38a8 (diff)
finish separation of tl_scripts and linked_scripts
git-svn-id: svn://tug.org/texlive/trunk@28928 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/am')
-rw-r--r--Build/source/texk/am/script_links.am13
1 files changed, 5 insertions, 8 deletions
diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am
index a0378fb4b64..a8986e487fb 100644
--- a/Build/source/texk/am/script_links.am
+++ b/Build/source/texk/am/script_links.am
@@ -55,18 +55,15 @@ if !WIN32
$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
endif !WIN32
-EXTRA_DIST += ../../build-aux/relpath
+EXTRA_DIST += $(top_builddir)/../../build-aux/relpath
# We support native builds, multiplatform or not, as well as distro builds.
install-links:
- @if test -r "$(srcdir)/../../build-aux/relpath"; then \
- relpath="$(srcdir)/../../build-aux/relpath"; \
- elif test -r "$(srcdir)/../../../build-aux/relpath"; then \
- relpath="$(srcdir)/../../../build-aux/relpath"; \
- else \
- echo 'script_links.am:install-links: could not find relpath script';\
+ @relpath="$(top_srcdir)/../../build-aux/relpath"; \
+ test -r $$relpath || { \
+ echo 'script_links.am:install-links: could not find relpath script'; \
exit 1; \
- fi; \
+ }; \
REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
if test -z "$$REL"; then \
echo 'script_links.am:install_links: unable to compute relative path for linked $(TYPE) scripts' >&2; \