summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-12-06 14:50:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-12-06 14:50:09 +0000
commit6c7ac04da0ed0c0bcf3f63106addbd66c35d7388 (patch)
tree3bed1702a43b35d9ba17f669a343c35baf947691 /Build/source/utils/xindy
parentd4098ae6af4055044c234a33fc9f42b2e4638999 (diff)
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
Diffstat (limited to 'Build/source/utils/xindy')
-rw-r--r--Build/source/utils/xindy/ChangeLog5
-rw-r--r--Build/source/utils/xindy/Makefile.am4
-rw-r--r--Build/source/utils/xindy/Makefile.in2
-rwxr-xr-xBuild/source/utils/xindy/configure4
-rw-r--r--Build/source/utils/xindy/configure.ac4
5 files changed, 12 insertions, 7 deletions
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 <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac:
+ Replace ${prefix}/texmf => $(datarootdir)/texmf.
+
2011-11-04 Peter Breitenlohner <peb@mppmu.mpg.de>
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 <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## 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])