From 6c7ac04da0ed0c0bcf3f63106addbd66c35d7388 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 6 Dec 2011 14:50:09 +0000 Subject: build system - use TL specific installation directories only for `native' builds - replace ${prefix}/texmf => $(datarootdir)/texmf git-svn-id: svn://tug.org/texlive/trunk@24780 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/chktex/ChangeLog | 4 ++++ Build/source/utils/chktex/Makefile.am | 6 +++--- Build/source/utils/chktex/Makefile.in | 6 +++--- Build/source/utils/ps2eps/ChangeLog | 4 ++++ Build/source/utils/ps2eps/Makefile.am | 2 +- Build/source/utils/ps2eps/Makefile.in | 2 +- Build/source/utils/psutils/ChangeLog | 4 ++++ Build/source/utils/psutils/Makefile.am | 2 +- Build/source/utils/psutils/Makefile.in | 2 +- Build/source/utils/xindy/ChangeLog | 5 +++++ Build/source/utils/xindy/Makefile.am | 4 ++-- Build/source/utils/xindy/Makefile.in | 2 +- Build/source/utils/xindy/configure | 4 ++-- Build/source/utils/xindy/configure.ac | 4 ++-- 14 files changed, 34 insertions(+), 17 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog index 2cf30625957..03e56f25890 100644 --- a/Build/source/utils/chktex/ChangeLog +++ b/Build/source/utils/chktex/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-08-02 Peter Breitenlohner * getopt.h: Sync with ../../texk/kpathsea/getopt.h. diff --git a/Build/source/utils/chktex/Makefile.am b/Build/source/utils/chktex/Makefile.am index ad73f819b04..cafbbb3d0c3 100644 --- a/Build/source/utils/chktex/Makefile.am +++ b/Build/source/utils/chktex/Makefile.am @@ -58,7 +58,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../../texk/am/script_links.am -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) install-data-hook: install-perl-links @@ -69,12 +69,12 @@ bin_SCRIPTS = $(CHKTEX_TREE)/chkweb endif !WIN32 # resource file -configdir = ${prefix}/texmf/chktex +configdir = $(datarootdir)/texmf/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = ${prefix}/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf/doc/chktex dist_pdfdoc_DATA = ChkTeX.pdf diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in index bcf44c0268f..6a45345249f 100644 --- a/Build/source/utils/chktex/Makefile.in +++ b/Build/source/utils/chktex/Makefile.in @@ -254,16 +254,16 @@ nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) @WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb # resource file -configdir = ${prefix}/texmf/chktex +configdir = $(datarootdir)/texmf/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = ${prefix}/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf/doc/chktex dist_pdfdoc_DATA = ChkTeX.pdf CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.log chktest DISTCLEANFILES = stamp-tex diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog index a17dc0c5dbd..736b9c63380 100644 --- a/Build/source/utils/ps2eps/ChangeLog +++ b/Build/source/utils/ps2eps/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-09-22 Peter Breitenlohner * bbox.test: New shell script testing bbox. diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am index 67e6ed77347..44f2bedeea2 100644 --- a/Build/source/utils/ps2eps/Makefile.am +++ b/Build/source/utils/ps2eps/Makefile.am @@ -31,7 +31,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../../texk/am/script_links.am -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl install-data-hook: install-perl-links diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 20d72764509..e544d9bc0ab 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -216,7 +216,7 @@ nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl CLEANFILES = $(nodist_bin_SCRIPTS) TESTS = bbox.test diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog index fc62261c3da..6aeeb1e40f4 100644 --- a/Build/source/utils/psutils/ChangeLog +++ b/Build/source/utils/psutils/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-08 Peter Breitenlohner * psutils.test: Do not depend on floating point rounding. diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am index b049e005e90..684ce2397de 100644 --- a/Build/source/utils/psutils/Makefile.am +++ b/Build/source/utils/psutils/Makefile.am @@ -98,7 +98,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../../texk/am/script_links.am -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) if !WIN32 diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in index b71df5e9c20..01f219dae59 100644 --- a/Build/source/utils/psutils/Makefile.in +++ b/Build/source/utils/psutils/Makefile.in @@ -308,7 +308,7 @@ nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) @WIN32_FALSE@bin_SCRIPTS = $(sh_scripts) nodist_man1_MANS = \ diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index bece1919390..545372ca009 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,8 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am, configure.ac: + Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-04 Peter Breitenlohner Add persian alphabet. diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 9e61a2989c9..c5b14f952ff 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/xindy/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -65,7 +65,7 @@ if CLISP_RUNTIME rm -f "$(DESTDIR)$(bindir)/$(XINDY_RUN)" endif CLISP_RUNTIME -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) %.pl: $(XINDY_TREE)/user-commands/%.in diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index ce49a3c194a..e451621b50e 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -258,7 +258,7 @@ nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS) all: all-recursive diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 1f4bf702568..0018f3e8171 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -2513,8 +2513,8 @@ esac # Installation directories for TeX Live. memdir='$(bindir)' -pkglibdir='${prefix}/texmf/xindy' -docdir='${prefix}/texmf/doc/xindy' +pkglibdir='$(datarootdir)/texmf/xindy' +docdir='$(datarootdir)/texmf/doc/xindy' if test "x$enable_texlive_build" = xyes; then diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index ae005bf410c..db3a5d70d13 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -40,8 +40,8 @@ AS_CASE([$enable_xindy_docs], # Installation directories for TeX Live. memdir='$(bindir)' -pkglibdir='${prefix}/texmf/xindy' -docdir='${prefix}/texmf/doc/xindy' +pkglibdir='$(datarootdir)/texmf/xindy' +docdir='$(datarootdir)/texmf/doc/xindy' AC_SUBST([memdir]) AC_SUBST([pkglibdir]) AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes]) -- cgit v1.2.3