From e9078a55e107cf280ed071cfbdcf8bfcfab986c1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 9 Dec 2011 10:52:03 +0000 Subject: build system: More ${prefix}=> $(datarootdir) git-svn-id: svn://tug.org/texlive/trunk@24802 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ChangeLog | 4 ++++ Build/source/texk/am/script_links.am | 2 +- Build/source/texk/tetex/Makefile.in | 2 +- Build/source/texk/tex4htk/Makefile.in | 2 +- Build/source/texk/texlive/linked_scripts/ChangeLog | 4 ++++ Build/source/texk/texlive/linked_scripts/Makefile.am | 2 +- Build/source/texk/texlive/linked_scripts/Makefile.in | 2 +- 7 files changed, 13 insertions(+), 5 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 486ae702364..d677fa4cf85 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Peter Breitenlohner + + * am/script_links.am: Replace ${prefix} => $(datarootdir). + 2011-09-09 Peter Breitenlohner * ../build-aux/relpath: New shell script to compute relative diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am index 14079694336..c1ad75d4ee9 100644 --- a/Build/source/texk/am/script_links.am +++ b/Build/source/texk/am/script_links.am @@ -52,7 +52,7 @@ EXTRA_DIST += ../../build-aux/relpath # We support native builds, multiplatform or not, as well as distro builds. install-links: - @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ if test -z "$$REL"; then \ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ exit 1; \ diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index f2bd0893855..d6eebf055bf 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -969,7 +969,7 @@ install-shell-links: # We support native builds, multiplatform or not, as well as distro builds. install-links: - @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ if test -z "$$REL"; then \ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ exit 1; \ diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 3e641c9bc71..7bddb414dc9 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -896,7 +896,7 @@ install-shell-links: # We support native builds, multiplatform or not, as well as distro builds. install-links: - @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ if test -z "$$REL"; then \ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ exit 1; \ diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index f6ab9a46752..7f0ec1efac5 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Peter Breitenlohner + + * Makefile.am: More ${prefix} => $(datarootdir). + 2011-12-06 Peter Breitenlohner * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 3651ac4fdd2..60ada7f660a 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -178,7 +178,7 @@ else !WIN32 ## 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. - @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ if test -z "$$REL"; then \ echo 'unable to compute relative path for linked scripts' >&2; \ exit 1; \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 3d1bfcbcacb..aff3dfe400b 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -629,7 +629,7 @@ install-data-hook: @WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \ @WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \ @WIN32_TRUE@ done -@WIN32_FALSE@ @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ +@WIN32_FALSE@ @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ @WIN32_FALSE@ if test -z "$$REL"; then \ @WIN32_FALSE@ echo 'unable to compute relative path for linked scripts' >&2; \ @WIN32_FALSE@ exit 1; \ -- cgit v1.2.3