From a277fb9303587330b65a7081c637a1aa651c9d9a Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 24 Jan 2013 12:40:04 +0000 Subject: finish separation of tl_scripts and linked_scripts git-svn-id: svn://tug.org/texlive/trunk@28928 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/am/script_links.am | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/am') 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; \ -- cgit v1.2.3