build system: Merge texmf into texmf-dist

git-svn-id: svn://tug.org/texlive/trunk@29060 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 31 insertions, 14 deletions

diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog
index 5848d6b19ee..2ec3e19025b 100644
--- a/Build/source/utils/ps2eps/ChangeLog
+++ b/Build/source/utils/ps2eps/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (scriptsdir): Change texmf => texmf-dist.
+
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Allow subdir-objects.
diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am
index e4795a0db07..e5b7f0d1d95 100644
--- a/Build/source/utils/ps2eps/Makefile.am
+++ b/Build/source/utils/ps2eps/Makefile.am
@@ -26,7 +26,7 @@ man1_MANS = \
 	$(PS2EPS_TREE)/doc/man/man1/ps2eps.1
 
 perl_scripts = ps2eps
-scriptsdir = texmf/scripts/ps2eps
+scriptsdir = texmf-dist/scripts/ps2eps
 nodist_bin_SCRIPTS =
 
 include $(srcdir)/../../texk/am/script_links.am
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index b072f048c2c..fbea93b08bd 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -461,7 +461,7 @@ man1_MANS = \
 	$(PS2EPS_TREE)/doc/man/man1/ps2eps.1
 
 perl_scripts = ps2eps
-scriptsdir = texmf/scripts/ps2eps
+scriptsdir = texmf-dist/scripts/ps2eps
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog
index c69ff9b4e24..2d24c279958 100644
--- a/Build/source/utils/psutils/ChangeLog
+++ b/Build/source/utils/psutils/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (scriptsdir): Change texmf => texmf-dist.
+
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Allow subdir-objects.
diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index 840c2402066..4b9253eb2ca 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -93,7 +93,7 @@ sh_scripts = \
 	getafm \
 	showchar
 
-scriptsdir = texmf/scripts/psutils
+scriptsdir = texmf-dist/scripts/psutils
 nodist_bin_SCRIPTS =
 
 include $(srcdir)/../../texk/am/script_links.am
diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in
index 82dcba40406..aadad28a118 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -561,7 +561,7 @@ sh_scripts = \
 	getafm \
 	showchar
 
-scriptsdir = texmf/scripts/psutils
+scriptsdir = texmf-dist/scripts/psutils
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
diff --git a/Build/source/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog
index f0723c3e9f2..c301afb7021 100644
--- a/Build/source/utils/texdoctk/ChangeLog
+++ b/Build/source/utils/texdoctk/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (scriptsdir): Change texmf => texmf-dist.
+
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_COND_WIN32_WRAP for win32 wrappers.
diff --git a/Build/source/utils/texdoctk/Makefile.am b/Build/source/utils/texdoctk/Makefile.am
index 3d38b3af774..b33291b547d 100644
--- a/Build/source/utils/texdoctk/Makefile.am
+++ b/Build/source/utils/texdoctk/Makefile.am
@@ -2,7 +2,7 @@
 ## (In a separate directory because we hope that some day a new
 ##  volunteer will appear to take over this program.)
 ##
-## Copyright (C) 2012 Karl Berry <tex-live@tug.org>
+## Copyright (C) 2012, 2013 Karl Berry <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST =
 
 perl_scripts = texdoctk
-scriptsdir = texmf/scripts/texdoctk
+scriptsdir = texmf-dist/scripts/texdoctk
 nodist_bin_SCRIPTS =
 #
 include $(srcdir)/../../texk/am/script_links.am
diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in
index d70a67ca316..fcabfa499d5 100644
--- a/Build/source/utils/texdoctk/Makefile.in
+++ b/Build/source/utils/texdoctk/Makefile.in
@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(top_builddir)/../../build-aux/relpath
 perl_scripts = texdoctk
-scriptsdir = texmf/scripts/texdoctk
+scriptsdir = texmf-dist/scripts/texdoctk
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 075377452fa..dbc5b27a1d6 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (scriptsdir), configure.ac (pkglibdir, docdir):
+	Change texmf => texmf-dist.
+
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_COND_WIN32_WRAP for win32 wrappers.
diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am
index 2ee8f4532b3..964c10b613e 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-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -50,7 +50,7 @@ config.force:
 DISTCLEANFILES = config.force
 
 perl_scripts = texindy xindy
-scriptsdir = texmf/scripts/xindy
+scriptsdir = texmf-dist/scripts/xindy
 nodist_bin_SCRIPTS =
 
 include $(srcdir)/../../texk/am/script_links.am
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 5b155f8a7dd..e528bf6e3f2 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -323,7 +323,7 @@ SUBDIRS = . $(XINDY_TREE)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTCLEANFILES = config.force
 perl_scripts = texindy xindy
-scriptsdir = texmf/scripts/xindy
+scriptsdir = texmf-dist/scripts/xindy
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index c19c207ec30..f0b4a71cdec 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3677,8 +3677,8 @@ esac
 
 # Installation directories for TeX Live.
 memdir='$(bindir)'
-pkglibdir='$(datarootdir)/texmf/xindy'
-docdir='$(datarootdir)/texmf/doc/xindy'
+pkglibdir='$(datarootdir)/texmf-dist/xindy'
+docdir='$(datarootdir)/texmf-dist/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 74ec66d72b7..41579916ee7 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -39,8 +39,8 @@ AS_CASE([$enable_xindy_docs],
 
 # Installation directories for TeX Live.
 memdir='$(bindir)'
-pkglibdir='$(datarootdir)/texmf/xindy'
-docdir='$(datarootdir)/texmf/doc/xindy'
+pkglibdir='$(datarootdir)/texmf-dist/xindy'
+docdir='$(datarootdir)/texmf-dist/doc/xindy'
 AC_SUBST([memdir])
 AC_SUBST([pkglibdir])
 AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])