diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-02-08 12:05:33 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-02-08 12:05:33 +0000 |
| commit | 9b888649e62c7efd7a76b093153f23a145ab8b5a (patch) | |
| tree | a6697745e2583fee70566b85a6f89ef24b05af45 /Build | |
| parent | 5335b097801ae55377defd39dbcb2c66b7cab052 (diff) | |
build system: Merge texmf into texmf-dist
git-svn-id: svn://tug.org/texlive/trunk@29060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
58 files changed, 160 insertions, 91 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 45ab103f38f..2a4e9c685e7 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (mandir, infodir): Change texmf => texmf-dist. + 2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de> * tardate.ac: Switch to 2013-01-24. diff --git a/Build/source/configure b/Build/source/configure index 71ecd843071..17ee656303b 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20048,11 +20048,11 @@ if test "x$enable_native_texlive_build" = xyes; then ac_configure_args="$ac_configure_args '--datarootdir=$datarootdir'" fi if test "x$mandir" = 'x${datarootdir}/man'; then - mandir='${prefix}/texmf/doc/man' + mandir='${prefix}/texmf-dist/doc/man' ac_configure_args="$ac_configure_args '--mandir=$mandir'" fi if test "x$infodir" = 'x${datarootdir}/info'; then - infodir='${prefix}/texmf/doc/info' + infodir='${prefix}/texmf-dist/doc/info' ac_configure_args="$ac_configure_args '--infodir=$infodir'" fi fi diff --git a/Build/source/configure.ac b/Build/source/configure.ac index df1734efc5b..52ae4108c81 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -79,11 +79,11 @@ if test "x$enable_native_texlive_build" = xyes; then ac_configure_args="$ac_configure_args '--datarootdir=$datarootdir'" fi if test "x$mandir" = 'x${datarootdir}/man'; then - mandir='${prefix}/texmf/doc/man' + mandir='${prefix}/texmf-dist/doc/man' ac_configure_args="$ac_configure_args '--mandir=$mandir'" fi if test "x$infodir" = 'x${datarootdir}/info'; then - infodir='${prefix}/texmf/doc/info' + infodir='${prefix}/texmf-dist/doc/info' ac_configure_args="$ac_configure_args '--infodir=$infodir'" fi fi diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog index cabfb1a00ff..b8fa9ee7a0d 100644 --- a/Build/source/texk/bibtex8/ChangeLog +++ b/Build/source/texk/bibtex8/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (btdocdir): Change texmf => texmf-dist. + 2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid use of deprecated INCLUDES. diff --git a/Build/source/texk/bibtex8/Makefile.am b/Build/source/texk/bibtex8/Makefile.am index 1456cf1c4a8..0553cada8dd 100644 --- a/Build/source/texk/bibtex8/Makefile.am +++ b/Build/source/texk/bibtex8/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/bibtex8/ ## -## 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 @@ -44,7 +44,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = $(datarootdir)/texmf/doc/bibtex8 +btdocdir = $(datarootdir)/texmf-dist/doc/bibtex8 dist_btdoc_DATA = \ 00readme.txt \ diff --git a/Build/source/texk/bibtex8/Makefile.in b/Build/source/texk/bibtex8/Makefile.in index d5c183f0a03..ff26e0e310c 100644 --- a/Build/source/texk/bibtex8/Makefile.in +++ b/Build/source/texk/bibtex8/Makefile.in @@ -531,7 +531,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = $(datarootdir)/texmf/doc/bibtex8 +btdocdir = $(datarootdir)/texmf-dist/doc/bibtex8 dist_btdoc_DATA = \ 00readme.txt \ HISTORY \ diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index 732fc5bdb93..6743c618e75 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (btdocdir): Change texmf => texmf-dist. + 2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> * bibtex-2.c: Drop unused variable (gcc-4.6 warning). diff --git a/Build/source/texk/bibtexu/Makefile.am b/Build/source/texk/bibtexu/Makefile.am index 395d95923a3..a77bb71bd4a 100644 --- a/Build/source/texk/bibtexu/Makefile.am +++ b/Build/source/texk/bibtexu/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/bibtexu/ ## -## 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 @@ -49,7 +49,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = $(datarootdir)/texmf/doc/bibtexu +btdocdir = $(datarootdir)/texmf-dist/doc/bibtexu dist_btdoc_DATA = \ 00readme.txt \ diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in index 9624f29e709..5e0b34f6a71 100644 --- a/Build/source/texk/bibtexu/Makefile.in +++ b/Build/source/texk/bibtexu/Makefile.in @@ -564,7 +564,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = $(datarootdir)/texmf/doc/bibtexu +btdocdir = $(datarootdir)/texmf-dist/doc/bibtexu dist_btdoc_DATA = \ 00readme.txt \ HISTORY \ diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index 904db2ad79f..847f6de7362 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (configdir, pdfdocdir, 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/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 1e2059fce77..46d469e11b9 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -74,7 +74,7 @@ man_MANS = \ # scripts perl_scripts = deweb sh_scripts = chkweb -scriptsdir = texmf/scripts/chktex +scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = include $(srcdir)/../../texk/am/script_links.am @@ -87,12 +87,12 @@ install-data-hook: install-perl-links install-sh-links uninstall-hook: uninstall-links # resource file -configdir = $(datarootdir)/texmf/chktex +configdir = $(datarootdir)/texmf-dist/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = $(datarootdir)/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 29fc7f2fb0f..f4952e564fa 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -562,7 +562,7 @@ man_MANS = \ # scripts perl_scripts = deweb sh_scripts = chkweb -scriptsdir = texmf/scripts/chktex +scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = $(am__append_2) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @@ -572,11 +572,11 @@ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh # resource file -configdir = $(datarootdir)/texmf/chktex +configdir = $(datarootdir)/texmf-dist/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = $(datarootdir)/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf CLEANFILES = $(nodist_bin_SCRIPTS) chktest TESTS = chktex.test diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 326154af993..2332196ce83 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (hbf2gf_cfgdir): Change texmf => texmf-dist. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index 8bc1f5d4676..e6dc65de597 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -123,7 +123,7 @@ man1_MANS = \ $(CJKUTILS_TREE)/extconv/extconv.1 \ $(CJKUTILS_TREE)/hbf2gf/hbf2gf.1 -hbf2gf_cfgdir = $(datarootdir)/texmf/hbf2gf +hbf2gf_cfgdir = $(datarootdir)/texmf-dist/hbf2gf CFG = $(CJKUTILS_TREE)/hbf2gf/cfg hbf2gf_cfg_DATA = \ $(CFG)/b5ka12.cfg \ diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index a7beb1d30e4..b041e2a350e 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -601,7 +601,7 @@ man1_MANS = \ $(CJKUTILS_TREE)/extconv/extconv.1 \ $(CJKUTILS_TREE)/hbf2gf/hbf2gf.1 -hbf2gf_cfgdir = $(datarootdir)/texmf/hbf2gf +hbf2gf_cfgdir = $(datarootdir)/texmf-dist/hbf2gf CFG = $(CJKUTILS_TREE)/hbf2gf/cfg hbf2gf_cfg_DATA = \ $(CFG)/b5ka12.cfg \ diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index dd27fd42876..e42c44f0f50 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * data/Makefile.am (configdatadir, mapdatadir, cmapdatadir): + Change texmf => texmf-dist. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac, src/Makefile.am: Allow subdir-objects. diff --git a/Build/source/texk/dvipdfmx/data/Makefile.am b/Build/source/texk/dvipdfmx/data/Makefile.am index 831fbe0530a..1a9cbe259e9 100644 --- a/Build/source/texk/dvipdfmx/data/Makefile.am +++ b/Build/source/texk/dvipdfmx/data/Makefile.am @@ -1,11 +1,11 @@ -configdatadir = $(datarootdir)/texmf/dvipdfmx +configdatadir = $(datarootdir)/texmf-dist/dvipdfmx dist_configdata_DATA = dvipdfmx.cfg glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist dist_glyphlistdata_DATA = glyphlist.txt pdfglyphlist.txt -mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx +mapdatadir = $(datarootdir)/texmf-dist/fonts/map/dvipdfmx dist_mapdata_DATA = cid-x.map -cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx +cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx dist_cmapdata_DATA = EUC-UCS2 diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in index 7987746ea9e..0abbf98a829 100644 --- a/Build/source/texk/dvipdfmx/data/Makefile.in +++ b/Build/source/texk/dvipdfmx/data/Makefile.in @@ -255,13 +255,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -configdatadir = $(datarootdir)/texmf/dvipdfmx +configdatadir = $(datarootdir)/texmf-dist/dvipdfmx dist_configdata_DATA = dvipdfmx.cfg glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist dist_glyphlistdata_DATA = glyphlist.txt pdfglyphlist.txt -mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx +mapdatadir = $(datarootdir)/texmf-dist/fonts/map/dvipdfmx dist_mapdata_DATA = cid-x.map -cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx +cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx dist_cmapdata_DATA = EUC-UCS2 all: all-am diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 2ff5d9b8705..ca34c94b1f6 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (prologdir): Change texmf => texmf-dist. + 2013-01-21 Karl Berry <karl@tug.org> * test-dvips: rename from dvips.test, to avoid new Automake 1.13 diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 0305946e637..3cc5fe87848 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -82,7 +82,7 @@ dist_prologues = \ tex.lpro \ texps.lpro -prologdir = $(datarootdir)/texmf/dvips/base +prologdir = $(datarootdir)/texmf-dist/dvips/base prologues = $(dist_prologues:.lpro=.pro) texc.pro diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index e55fa7e6565..e013411b500 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -665,7 +665,7 @@ dist_prologues = \ tex.lpro \ texps.lpro -prologdir = $(datarootdir)/texmf/dvips/base +prologdir = $(datarootdir)/texmf-dist/dvips/base prologues = $(dist_prologues:.lpro=.pro) texc.pro SUFFIXES = .pro .lpro EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \ diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog index 52e0aa70045..ffac3b217f5 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (gsftopkpsheaderdir): Change texmf => texmf-dist. + 2012-12-17 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Enable silent rules. diff --git a/Build/source/texk/gsftopk/Makefile.am b/Build/source/texk/gsftopk/Makefile.am index 11309662481..7bbbeaa0936 100644 --- a/Build/source/texk/gsftopk/Makefile.am +++ b/Build/source/texk/gsftopk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/gsftopk/ ## -## 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 @@ -29,7 +29,7 @@ LDADD = $(KPATHSEA_LIBS) dist_gsftopkpsheader_DATA = render.ps -gsftopkpsheaderdir = $(datarootdir)/texmf/dvips/gsftopk +gsftopkpsheaderdir = $(datarootdir)/texmf-dist/dvips/gsftopk nodist_man1_MANS = gsftopk.1 diff --git a/Build/source/texk/gsftopk/Makefile.in b/Build/source/texk/gsftopk/Makefile.in index a59dc43570d..6307b621093 100644 --- a/Build/source/texk/gsftopk/Makefile.in +++ b/Build/source/texk/gsftopk/Makefile.in @@ -337,7 +337,7 @@ gsftopk_SOURCES = \ DISTCLEANFILES = config.force gsftopk.1 sedscript LDADD = $(KPATHSEA_LIBS) dist_gsftopkpsheader_DATA = render.ps -gsftopkpsheaderdir = $(datarootdir)/texmf/dvips/gsftopk +gsftopkpsheaderdir = $(datarootdir)/texmf-dist/dvips/gsftopk nodist_man1_MANS = gsftopk.1 EXTRA_DIST = gsftopk1.sed mksedscript all: c-auto.h diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index f3dbfc5e2e5..1f1a4d898c7 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (web2cdir): Change texmf => texmf-dist. + 2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_COND_MINGW32. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 016aaed0ee2..ed8e5aef617 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/kpathsea/ ## -## 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 @@ -234,7 +234,7 @@ progname_test_LDADD = libkpathsea.la xdirtest_LDADD = libkpathsea.la ## The scripts and their data -web2cdir = $(datarootdir)/texmf/web2c +web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 9f9c118eca2..1100ac7d0b0 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -738,7 +738,7 @@ progname_test_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL -DTEST progname_test_SOURCES = progname.c progname_test_LDADD = libkpathsea.la xdirtest_LDADD = libkpathsea.la -web2cdir = $(datarootdir)/texmf/web2c +web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index c176467f705..3e21bd26a8d 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (texmf_scriptsdir): Change texmf => texmf-dist. + Change man dir link accordingly. + 2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am [WIN32]: Install {rungs,tlmgr}.exe wrappers. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index cf80123c599..9987f27f6e9 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -50,7 +50,7 @@ installdirs-local: ## Some /bin/sh scripts are listed as `other' or `context' ## scripts because they are correctly handled by the wrapper binaries. ## -texmf_scriptsdir = $(datarootdir)/texmf/scripts +texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts texmf_other_scripts = \ texlive/rungs.tlu \ texlive/tlmgr.pl @@ -223,13 +223,7 @@ else !WIN32 exit 1; \ fi; \ cd $(DESTDIR)$(bindir) && \ - for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ - target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ - rm -f $$target; \ - echo "creating link '$$target' -> '$$REL/texmf/scripts/$$s'"; \ - $(LN_S) $$REL/texmf/scripts/$$s $$target || exit 1; \ - done && \ - for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ + for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ echo "$$s" | grep listings-ext.sh >/dev/null \ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ @@ -246,12 +240,12 @@ else !WIN32 done && \ ## man dir link for those mans which can use it, but don't overwrite a ## real file, e.g., /usr/bin/man. - if test -d "$$REL/texmf/doc/man" \ + if test -d "$$REL/texmf-dist/doc/man" \ && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \ && (test -h man || test ! -e man); then \ - echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \ + echo "creating link 'man' -> '$$REL/texmf-dist/doc/man'"; \ rm -f man; \ - (ln -s "$$REL/texmf/doc/man" man || :); \ + (ln -s "$$REL/texmf-dist/doc/man" man || :); \ else :; fi endif !WIN32 diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 369af9b0e42..12330d9d6d3 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -230,7 +230,7 @@ EXTRA_DIST = scripts.lst ../../../build-aux/relpath # dangling symlinks produced by `make install'. # The instances in texmf* are the masters (except when it is CTAN). # -texmf_scriptsdir = $(datarootdir)/texmf/scripts +texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts texmf_other_scripts = \ texlive/rungs.tlu \ texlive/tlmgr.pl @@ -724,13 +724,7 @@ install-data-hook: installdirs-local @WIN32_FALSE@ exit 1; \ @WIN32_FALSE@ fi; \ @WIN32_FALSE@ cd $(DESTDIR)$(bindir) && \ -@WIN32_FALSE@ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ -@WIN32_FALSE@ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ -@WIN32_FALSE@ rm -f $$target; \ -@WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf/scripts/$$s'"; \ -@WIN32_FALSE@ $(LN_S) $$REL/texmf/scripts/$$s $$target || exit 1; \ -@WIN32_FALSE@ done && \ -@WIN32_FALSE@ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ +@WIN32_FALSE@ for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ @WIN32_FALSE@ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ @WIN32_FALSE@ echo "$$s" | grep listings-ext.sh >/dev/null \ @WIN32_FALSE@ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ @@ -745,12 +739,12 @@ install-data-hook: installdirs-local @WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \ @WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \ @WIN32_FALSE@ done && \ -@WIN32_FALSE@ if test -d "$$REL/texmf/doc/man" \ +@WIN32_FALSE@ if test -d "$$REL/texmf-dist/doc/man" \ @WIN32_FALSE@ && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \ @WIN32_FALSE@ && (test -h man || test ! -e man); then \ -@WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \ +@WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf-dist/doc/man'"; \ @WIN32_FALSE@ rm -f man; \ -@WIN32_FALSE@ (ln -s "$$REL/texmf/doc/man" man || :); \ +@WIN32_FALSE@ (ln -s "$$REL/texmf-dist/doc/man" man || :); \ @WIN32_FALSE@ else :; fi .PHONY: install-links diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog index c82e027ea13..be2ac909488 100644 --- a/Build/source/texk/texlive/tl_scripts/ChangeLog +++ b/Build/source/texk/texlive/tl_scripts/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am ({texconfig,web2c}dir): Change texmf => texmf-dist. + 2013-01-26 Karl Berry <karl@tug.org> * Makefile.am (echo-shell-scripts): new target, for diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index 9059e372525..4f4d864c575 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -93,11 +93,11 @@ man1_links = \ include $(top_srcdir)/../am/man1_links.am ## Support files -texconfigdir = $(datarootdir)/texmf/texconfig +texconfigdir = $(datarootdir)/texmf-dist/texconfig dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map -web2cdir = $(datarootdir)/texmf/web2c +web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_DATA = fmtutil.cnf ## Generate the updmap man page using help2man plus a bit of diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 0752421c34a..4d7dbe2b7be 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -279,10 +279,10 @@ man1_links = \ texconfig:texconfig-sys \ updmap:updmap-sys -texconfigdir = $(datarootdir)/texmf/texconfig +texconfigdir = $(datarootdir)/texmf-dist/texconfig dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map -web2cdir = $(datarootdir)/texmf/web2c +web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_DATA = fmtutil.cnf run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \ diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index e42f24feece..51dead75ef8 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am ({cfg,enc}datadir): Change texmf => texmf-dist. + 2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> * subfont.c: Drop unused variable (gcc-4.6 warning). diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am index e75b15844e9..ad3bb69b1d1 100644 --- a/Build/source/texk/ttf2pk/Makefile.am +++ b/Build/source/texk/ttf2pk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/ttf2pk/ ## -## 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 @@ -69,10 +69,10 @@ dist_man1_MANS = ttf2pk.1 ttf2tfm.1 ## Data ## -cfgdatadir = $(datarootdir)/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf-dist/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf-dist/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in index 044ce086fac..a116c79443c 100644 --- a/Build/source/texk/ttf2pk/Makefile.in +++ b/Build/source/texk/ttf2pk/Makefile.in @@ -564,9 +564,9 @@ ttf2tfm_SOURCES = \ DISTCLEANFILES = config.force GenR-ec.vpl GenR102-* ipaexg-* LDADD = $(KPATHSEA_LIBS) $(FREETYPE_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -cfgdatadir = $(datarootdir)/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf-dist/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf-dist/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog index 422c195259d..25777b62063 100644 --- a/Build/source/texk/ttf2pk2/ChangeLog +++ b/Build/source/texk/ttf2pk2/ChangeLog @@ -1,3 +1,7 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am ({cfg,enc}datadir): Change texmf => texmf-dist. + 2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> * ftlib.c: Drop unused functions get_Short() and get_Long(). diff --git a/Build/source/texk/ttf2pk2/Makefile.am b/Build/source/texk/ttf2pk2/Makefile.am index dd496bbe1f4..2fb142e9037 100644 --- a/Build/source/texk/ttf2pk2/Makefile.am +++ b/Build/source/texk/ttf2pk2/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/ttf2pk2/ ## -## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -71,10 +71,10 @@ dist_man1_MANS = ttf2pk.1 ttf2tfm.1 ## Data ## -cfgdatadir = $(datarootdir)/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf-dist/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf-dist/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in index 1791f8a34c2..efb37717263 100644 --- a/Build/source/texk/ttf2pk2/Makefile.in +++ b/Build/source/texk/ttf2pk2/Makefile.in @@ -573,9 +573,9 @@ ttf2tfm_SOURCES = \ DISTCLEANFILES = config.force GenR-ec.vpl GenR102-* ipaexg-* LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -cfgdatadir = $(datarootdir)/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf-dist/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf-dist/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index f6295328696..018557b28c6 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,6 +1,10 @@ ChangeLog.TL: Changes for xdvik (TeX Live) ================================================== +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (xdvidir, pixmapdir): Change texmf => texmf-dist. + 2012-12-16 Peter Breitenlohner <peb@mppmu.mpg.de> * util.c: Adapt to modified hash_lookup() return type. diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index 28293201fe1..8e722f2d216 100644 --- a/Build/source/texk/xdvik/Makefile.am +++ b/Build/source/texk/xdvik/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/xdvik/ ## -## 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 -I m4 @@ -202,10 +202,10 @@ sedscript: mksedscript CHANGES Makefile c-auto.h EXTRA_DIST += mksedscript xdvi.1.in CLEANFILES += sedscript xdvi.1 -xdvidir = $(datarootdir)/texmf/xdvi +xdvidir = $(datarootdir)/texmf-dist/xdvi dist_xdvi_DATA = texmf/XDvi -pixmapdir = $(datarootdir)/texmf/xdvi/pixmap +pixmapdir = $(datarootdir)/texmf-dist/xdvi/pixmap dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm dist_noinst_DATA = texmf/xdvi.cfg diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in index c760ae705b7..21a8b3da09a 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -527,9 +527,9 @@ EXTRA_DIST = psheader.txt mksedscript xdvi.1.in BUGS CHANGES \ xdvi.icon xdvizilla xdvizilla.1 CLEANFILES = psheader.c sedscript xdvi.1 nodist_man1_MANS = xdvi.1 -xdvidir = $(datarootdir)/texmf/xdvi +xdvidir = $(datarootdir)/texmf-dist/xdvi dist_xdvi_DATA = texmf/XDvi -pixmapdir = $(datarootdir)/texmf/xdvi/pixmap +pixmapdir = $(datarootdir)/texmf-dist/xdvi/pixmap dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm dist_noinst_DATA = texmf/xdvi.cfg all: c-auto.h diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index ce30b07937e..def611cbf3c 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * data/Makefile.am (configdatadir, mapdatadir, cmapdatadir): + Change texmf => texmf-dist (sync from ../dvipdfmx). + 2013-01-21 Peter Breitenlohner <peb@mppmu.mpg.de> * src/dvi.c: Avoid unused variables sbuf and slen. diff --git a/Build/source/texk/xdvipdfmx/data/Makefile.am b/Build/source/texk/xdvipdfmx/data/Makefile.am index 0391e31015f..e9fad11e157 100644 --- a/Build/source/texk/xdvipdfmx/data/Makefile.am +++ b/Build/source/texk/xdvipdfmx/data/Makefile.am @@ -1,4 +1,4 @@ -configdatadir = $(datarootdir)/texmf/dvipdfmx +configdatadir = $(datarootdir)/texmf-dist/dvipdfmx dist_configdata_DATA = \ $(srcdir)/dvipdfmx.cfg @@ -7,10 +7,10 @@ dist_glyphlistdata_DATA = \ $(srcdir)/glyphlist.txt \ $(srcdir)/pdfglyphlist.txt -mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx +mapdatadir = $(datarootdir)/texmf/fonts-dist/map/dvipdfmx dist_mapdata_DATA = \ $(srcdir)/cid-x.map -cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx +cmapdatadir = $(datarootdir)/texmf/fonts-dist/cmap/dvipdfmx dist_cmapdata_DATA = \ $(srcdir)/EUC-UCS2 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]) |