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/texk/bibtex8/ChangeLog | 4 + Build/source/texk/bibtex8/Makefile.am | 4 +- Build/source/texk/bibtex8/Makefile.in | 4 +- Build/source/texk/bibtexu/ChangeLog | 4 + Build/source/texk/bibtexu/Makefile.am | 4 +- Build/source/texk/bibtexu/Makefile.in | 4 +- Build/source/texk/cjkutils/ChangeLog | 4 + Build/source/texk/cjkutils/Makefile.am | 2 +- Build/source/texk/cjkutils/Makefile.in | 2 +- Build/source/texk/dvipdfmx/ChangeLog | 4 + Build/source/texk/dvipdfmx/Makefile.am | 8 +- Build/source/texk/dvipdfmx/Makefile.in | 8 +- Build/source/texk/dvipsk/ChangeLog | 4 + Build/source/texk/dvipsk/Makefile.am | 4 +- Build/source/texk/dvipsk/Makefile.in | 2 +- Build/source/texk/gsftopk/ChangeLog | 4 + Build/source/texk/gsftopk/Makefile.am | 4 +- Build/source/texk/gsftopk/Makefile.in | 2 +- Build/source/texk/kpathsea/ChangeLog | 4 + Build/source/texk/kpathsea/Makefile.am | 2 +- Build/source/texk/kpathsea/Makefile.in | 2 +- Build/source/texk/lcdf-typetools/Makefile.am | 4 +- Build/source/texk/lcdf-typetools/Makefile.in | 4 +- Build/source/texk/tetex/ChangeLog | 4 + Build/source/texk/tetex/Makefile.am | 6 +- Build/source/texk/tetex/Makefile.in | 6 +- Build/source/texk/tex4htk/ChangeLog | 4 + Build/source/texk/tex4htk/Makefile.am | 2 +- Build/source/texk/tex4htk/Makefile.in | 2 +- Build/source/texk/texlive/linked_scripts/ChangeLog | 4 + .../source/texk/texlive/linked_scripts/Makefile.am | 4 +- .../source/texk/texlive/linked_scripts/Makefile.in | 4 +- Build/source/texk/ttf2pk/ChangeLog | 4 + Build/source/texk/ttf2pk/Makefile.am | 8 +- Build/source/texk/ttf2pk/Makefile.in | 8 +- Build/source/texk/ttf2pk2/ChangeLog | 4 + Build/source/texk/ttf2pk2/Makefile.am | 8 +- Build/source/texk/ttf2pk2/Makefile.in | 8 +- Build/source/texk/web2c/configure | 88 ++++++++++++++++------ Build/source/texk/xdvik/ChangeLog.TL | 4 + Build/source/texk/xdvik/Makefile.am | 6 +- Build/source/texk/xdvik/Makefile.in | 4 +- Build/source/texk/xdvipdfmx/ChangeLog.TL | 5 ++ Build/source/texk/xdvipdfmx/data/Makefile.am | 4 +- 44 files changed, 186 insertions(+), 89 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog index 20f8b36b86a..ef69271851f 100644 --- a/Build/source/texk/bibtex8/ChangeLog +++ b/Build/source/texk/bibtex8/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-10-04 Peter Breitenlohner * Makefile.am (DISTCLEANFILES): Preserve distributed files. diff --git a/Build/source/texk/bibtex8/Makefile.am b/Build/source/texk/bibtex8/Makefile.am index fe109aee86f..fff00562cc4 100644 --- a/Build/source/texk/bibtex8/Makefile.am +++ b/Build/source/texk/bibtex8/Makefile.am @@ -33,7 +33,7 @@ LDADD = $(KPATHSEA_LIBS) ## Rebuild libkpathsea @KPATHSEA_RULE@ -csfdir = ${prefix}/texmf-dist/bibtex/csf/base +csfdir = $(datarootdir)/texmf-dist/bibtex/csf/base dist_csf_DATA = \ csf/88591lat.csf \ @@ -45,7 +45,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = ${prefix}/texmf/doc/bibtex8 +btdocdir = $(datarootdir)/texmf/doc/bibtex8 dist_btdoc_DATA = \ 00readme.txt \ diff --git a/Build/source/texk/bibtex8/Makefile.in b/Build/source/texk/bibtex8/Makefile.in index 98a8ee8a70a..463f5d09b33 100644 --- a/Build/source/texk/bibtex8/Makefile.in +++ b/Build/source/texk/bibtex8/Makefile.in @@ -269,7 +269,7 @@ bibtex8_SOURCES = \ sysdep.h LDADD = $(KPATHSEA_LIBS) -csfdir = ${prefix}/texmf-dist/bibtex/csf/base +csfdir = $(datarootdir)/texmf-dist/bibtex/csf/base dist_csf_DATA = \ csf/88591lat.csf \ csf/88591sca.csf \ @@ -280,7 +280,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = ${prefix}/texmf/doc/bibtex8 +btdocdir = $(datarootdir)/texmf/doc/bibtex8 dist_btdoc_DATA = \ 00readme.txt \ HISTORY \ diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index 28c26b6af7d..973198d78da 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-10-04 Peter Breitenlohner * Makefile.am (DISTCLEANFILES): Add CXXLD.sh. diff --git a/Build/source/texk/bibtexu/Makefile.am b/Build/source/texk/bibtexu/Makefile.am index 680a9b5b34d..8c5c029ed3d 100644 --- a/Build/source/texk/bibtexu/Makefile.am +++ b/Build/source/texk/bibtexu/Makefile.am @@ -38,7 +38,7 @@ LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) ## Rebuild libsicuxxx @ICU_RULE@ -csfdir = ${prefix}/texmf-dist/bibtex/csf/base +csfdir = $(datarootdir)/texmf-dist/bibtex/csf/base dist_csf_DATA = \ csf/88591lat.csf \ @@ -50,7 +50,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = ${prefix}/texmf/doc/bibtexu +btdocdir = $(datarootdir)/texmf/doc/bibtexu dist_btdoc_DATA = \ 00readme.txt \ diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in index 4b1b751dd1d..6ef8d4a03d2 100644 --- a/Build/source/texk/bibtexu/Makefile.in +++ b/Build/source/texk/bibtexu/Makefile.in @@ -293,7 +293,7 @@ bibtexu_SOURCES = \ sysdep.h LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) -csfdir = ${prefix}/texmf-dist/bibtex/csf/base +csfdir = $(datarootdir)/texmf-dist/bibtex/csf/base dist_csf_DATA = \ csf/88591lat.csf \ csf/88591sca.csf \ @@ -304,7 +304,7 @@ dist_csf_DATA = \ csf/cp866rus.csf \ csf/csfile.txt -btdocdir = ${prefix}/texmf/doc/bibtexu +btdocdir = $(datarootdir)/texmf/doc/bibtexu dist_btdoc_DATA = \ 00readme.txt \ HISTORY \ diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 25672bd98b3..45be7ae7a9a 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-10-04 Peter Breitenlohner Updates from http://git.savannah.gnu.org/r/cjk.git. diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index d247fe4648f..092205faacb 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -124,7 +124,7 @@ man1_MANS = \ $(CJKUTILS_TREE)/extconv/extconv.1 \ $(CJKUTILS_TREE)/hbf2gf/hbf2gf.1 -hbf2gf_cfgdir = ${prefix}/texmf/hbf2gf +hbf2gf_cfgdir = $(datarootdir)/texmf/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 d21872c99a0..892dfdf9d3c 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -347,7 +347,7 @@ man1_MANS = \ $(CJKUTILS_TREE)/extconv/extconv.1 \ $(CJKUTILS_TREE)/hbf2gf/hbf2gf.1 -hbf2gf_cfgdir = ${prefix}/texmf/hbf2gf +hbf2gf_cfgdir = $(datarootdir)/texmf/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 3102306fa7d..4450feeac51 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-05 Akira Kakuto * dvi.c, spc-pdfm.c, tfm.c and vf.c: remove incompatible lines diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am index 613b4f20549..cd6b8c097c8 100644 --- a/Build/source/texk/dvipdfmx/Makefile.am +++ b/Build/source/texk/dvipdfmx/Makefile.am @@ -210,20 +210,20 @@ DISTCLEANFILES = config.force ## Data ## -configdatadir = ${prefix}/texmf/dvipdfmx +configdatadir = $(datarootdir)/texmf/dvipdfmx configdata_DATA = \ $(DVIPDFMX_TREE)/data/dvipdfmx.cfg -glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist +glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist glyphlistdata_DATA = \ $(DVIPDFMX_TREE)/data/glyphlist.txt \ $(DVIPDFMX_TREE)/data/pdfglyphlist.txt -mapdatadir = ${prefix}/texmf/fonts/map/dvipdfmx +mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx mapdata_DATA = \ $(DVIPDFMX_TREE)/data/cid-x.map -cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx +cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx cmapdata_DATA = \ $(DVIPDFMX_TREE)/data/EUC-UCS2 diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in index a172349f1d2..491c1709228 100644 --- a/Build/source/texk/dvipdfmx/Makefile.in +++ b/Build/source/texk/dvipdfmx/Makefile.in @@ -467,20 +467,20 @@ bin_links = \ dvipdfmx$(EXEEXT):extractbb DISTCLEANFILES = config.force -configdatadir = ${prefix}/texmf/dvipdfmx +configdatadir = $(datarootdir)/texmf/dvipdfmx configdata_DATA = \ $(DVIPDFMX_TREE)/data/dvipdfmx.cfg -glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist +glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist glyphlistdata_DATA = \ $(DVIPDFMX_TREE)/data/glyphlist.txt \ $(DVIPDFMX_TREE)/data/pdfglyphlist.txt -mapdatadir = ${prefix}/texmf/fonts/map/dvipdfmx +mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx mapdata_DATA = \ $(DVIPDFMX_TREE)/data/cid-x.map -cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx +cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx cmapdata_DATA = \ $(DVIPDFMX_TREE)/data/EUC-UCS2 diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 4087e3c251b..35435dde8e7 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-10-20 Werner Fink * dospecial.c (fgetboundingbox): Increase `buf' size to avoid diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 9475e154f66..7e184a5a40d 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipsk/ ## -## 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 @@ -83,7 +83,7 @@ dist_prologues = \ tex.lpro \ texps.lpro -prologdir = ${prefix}/texmf/dvips/base +prologdir = $(datarootdir)/texmf/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 c8d915f50a0..7ca57c0fbcc 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -380,7 +380,7 @@ dist_prologues = \ tex.lpro \ texps.lpro -prologdir = ${prefix}/texmf/dvips/base +prologdir = $(datarootdir)/texmf/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 0a1b414e7a7..dac076baf07 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-08-03 Peter Breitenlohner * gsftopk.c [MINGW32]: Drop superfluous dostounix_filename(). diff --git a/Build/source/texk/gsftopk/Makefile.am b/Build/source/texk/gsftopk/Makefile.am index b1196e01f55..db3d1510a1f 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 Peter Breitenlohner +## Copyright (C) 2009, 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -30,7 +30,7 @@ LDADD = $(KPATHSEA_LIBS) dist_gsftopkpsheader_DATA = render.ps -gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk +gsftopkpsheaderdir = $(datarootdir)/texmf/dvips/gsftopk nodist_man1_MANS = gsftopk.1 diff --git a/Build/source/texk/gsftopk/Makefile.in b/Build/source/texk/gsftopk/Makefile.in index 4363918cd08..e614e9bb90e 100644 --- a/Build/source/texk/gsftopk/Makefile.in +++ b/Build/source/texk/gsftopk/Makefile.in @@ -259,7 +259,7 @@ gsftopk_SOURCES = \ DISTCLEANFILES = config.force gsftopk.1 sedscript LDADD = $(KPATHSEA_LIBS) dist_gsftopkpsheader_DATA = render.ps -gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk +gsftopkpsheaderdir = $(datarootdir)/texmf/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 36b33dbbf37..f432b106795 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-10-27 Karl Berry * texmf.cnf (FONTCONFIG_*): doc+formatting fix. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 495ed284f7f..795aee6fe2e 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -228,7 +228,7 @@ progname_test_LDADD = libkpathsea.la xdirtest_LDADD = libkpathsea.la ## The scripts and their data -web2cdir = ${prefix}/texmf/web2c +web2cdir = $(datarootdir)/texmf/web2c dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index bfc065cedef..cd93e489ae8 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -466,7 +466,7 @@ progname_test_CPPFLAGS = -DMAKE_KPSE_DLL -DTEST progname_test_SOURCES = progname.c progname_test_LDADD = libkpathsea.la xdirtest_LDADD = libkpathsea.la -web2cdir = ${prefix}/texmf/web2c +web2cdir = $(datarootdir)/texmf/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/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index ea44b449974..fee80b4c8e0 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -15,8 +15,8 @@ config.force: $(KPATHSEA_DEPEND) DISTCLEANFILES = config.force CXXLD.sh if texlive_build -glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist -encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base +glyphlistdir = $(datarootdir)/texmf-dist/fonts/map/glyphlist +encdir = $(datarootdir)/texmf-dist/fonts/enc/dvips/base else !texlive_build glyphlistdir = $(pkgdatadir) encdir = $(pkgdatadir) diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index de292eb65fb..8963ecb2bfc 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -278,9 +278,9 @@ SUBDIRS = . liblcdf libefont @SELECTED_SUBDIRS@ DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 DISTCLEANFILES = config.force CXXLD.sh @texlive_build_FALSE@glyphlistdir = $(pkgdatadir) -@texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist +@texlive_build_TRUE@glyphlistdir = $(datarootdir)/texmf-dist/fonts/map/glyphlist @texlive_build_FALSE@encdir = $(pkgdatadir) -@texlive_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base +@texlive_build_TRUE@encdir = $(datarootdir)/texmf-dist/fonts/enc/dvips/base glyphlist_DATA = glyphlist.txt texglyphlist.txt enc_DATA = 7t.enc EXTRA_DIST = ONEWS lcdf-typetools.spec include/config.h \ diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 2aa18e94ee0..b3fcdbcee18 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-16 Norbert Preining * updmap.pl: make sure that kanjiEmbed is set to a default value diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index 685655eb46f..2a9558219bd 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -37,7 +37,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../am/script_links.am -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) if !WIN32 @@ -71,11 +71,11 @@ dist_man5_MANS = \ fmtutil.cnf.5 \ updmap.cfg.5 -texconfigdir = ${prefix}/texmf/texconfig +texconfigdir = $(datarootdir)/texmf/texconfig dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map -web2cdir = ${prefix}/texmf/web2c +web2cdir = $(datarootdir)/texmf/web2c dist_web2c_DATA = fmtutil.cnf bin_links = \ diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index 241a1d1ae4e..f2bd0893855 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -226,7 +226,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) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts) CLEANFILES = $(nodist_bin_SCRIPTS) @@ -255,10 +255,10 @@ dist_man5_MANS = \ fmtutil.cnf.5 \ updmap.cfg.5 -texconfigdir = ${prefix}/texmf/texconfig +texconfigdir = $(datarootdir)/texmf/texconfig dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map -web2cdir = ${prefix}/texmf/web2c +web2cdir = $(datarootdir)/texmf/web2c dist_web2c_DATA = fmtutil.cnf bin_links = \ allcm:allec \ diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index cf6cc702bbc..eb5a55823e6 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-09-09 Peter Breitenlohner * Makefile.am: Adapt to script_links.am using relpath. diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index f5b4589f5a0..6d0295ef9eb 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -36,7 +36,7 @@ nodist_bin_SCRIPTS = include $(srcdir)/../am/script_links.am -texmfdir = ${prefix}/$(scriptsdir) +texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) install-data-hook: install-perl-links install-shell-links diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 4872a2666c3..3e641c9bc71 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -286,7 +286,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) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) @WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat) CLEANFILES = $(nodist_bin_SCRIPTS) diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index 8616f92ee72..f6ab9a46752 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-12-05 Peter Breitenlohner * Makefile.am (uninstall-hook): Only remove man if it is a link. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 7b4594a8771..3651ac4fdd2 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -34,7 +34,7 @@ bin_SCRIPTS = # dangling symlinks produced by `make install'. # The instances in texmf* are the masters (except when it is CTAN). # -texmf_scriptsdir = ${prefix}/texmf/scripts +texmf_scriptsdir = $(datarootdir)/texmf/scripts ## We distinguish shell and other (perl, lua, python, ruby, ...) scripts. texmf_shell_scripts = \ simpdftex/simpdftex @@ -49,7 +49,7 @@ nobase_dist_texmf_scripts_SCRIPTS = \ $(texmf_shell_scripts) \ $(texmf_other_scripts) -texmf_dist_scriptsdir = ${prefix}/texmf-dist/scripts +texmf_dist_scriptsdir = $(datarootdir)/texmf-dist/scripts texmf_dist_shell_scripts = \ bibexport/bibexport.sh \ installfont/installfont-tl \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index b38ab2d347d..3d1bfcbcacb 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -187,7 +187,7 @@ bin_SCRIPTS = # dangling symlinks produced by `make install'. # The instances in texmf* are the masters (except when it is CTAN). # -texmf_scriptsdir = ${prefix}/texmf/scripts +texmf_scriptsdir = $(datarootdir)/texmf/scripts texmf_shell_scripts = \ simpdftex/simpdftex @@ -203,7 +203,7 @@ nobase_dist_texmf_scripts_SCRIPTS = \ $(texmf_shell_scripts) \ $(texmf_other_scripts) -texmf_dist_scriptsdir = ${prefix}/texmf-dist/scripts +texmf_dist_scriptsdir = $(datarootdir)/texmf-dist/scripts texmf_dist_shell_scripts = \ bibexport/bibexport.sh \ installfont/installfont-tl \ diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index c93ce5a46d0..c43a3b26645 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-02 Peter Breitenlohner * ttf2pk.c (main): Bug fix: mapfiles is malloc()ed, so do not diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am index 7d9db839d2f..dd4731341b5 100644 --- a/Build/source/texk/ttf2pk/Makefile.am +++ b/Build/source/texk/ttf2pk/Makefile.am @@ -69,16 +69,16 @@ dist_man1_MANS = ttf2pk.1 ttf2tfm.1 ## Data ## -cfgdatadir = ${prefix}/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = ${prefix}/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc -mapdatadir = ${prefix}/texmf-dist/source/fonts/zhmetrics +mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map -sfddatadir = ${prefix}/texmf-dist/fonts/sfd/ttf2pk +sfddatadir = $(datarootdir)/texmf-dist/fonts/sfd/ttf2pk dist_sfddata_DATA = \ data/Big5.sfd \ data/EUC.sfd \ diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in index d8fd9c33290..63d1bfc3045 100644 --- a/Build/source/texk/ttf2pk/Makefile.in +++ b/Build/source/texk/ttf2pk/Makefile.in @@ -312,13 +312,13 @@ ttf2tfm_SOURCES = \ DISTCLEANFILES = config.force GenR-ec.vpl GenR102-* LDADD = $(KPATHSEA_LIBS) $(FREETYPE_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -cfgdatadir = ${prefix}/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = ${prefix}/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc -mapdatadir = ${prefix}/texmf-dist/source/fonts/zhmetrics +mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map -sfddatadir = ${prefix}/texmf-dist/fonts/sfd/ttf2pk +sfddatadir = $(datarootdir)/texmf-dist/fonts/sfd/ttf2pk dist_sfddata_DATA = \ data/Big5.sfd \ data/EUC.sfd \ diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog index d872f43c6d6..1e9fb42ec42 100644 --- a/Build/source/texk/ttf2pk2/ChangeLog +++ b/Build/source/texk/ttf2pk2/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-02 Peter Breitenlohner * ttf2pk.c (main): Bug fix: mapfiles is malloc()ed, so do not diff --git a/Build/source/texk/ttf2pk2/Makefile.am b/Build/source/texk/ttf2pk2/Makefile.am index 73251207873..e3d00fa9692 100644 --- a/Build/source/texk/ttf2pk2/Makefile.am +++ b/Build/source/texk/ttf2pk2/Makefile.am @@ -69,16 +69,16 @@ dist_man1_MANS = ttf2pk.1 ttf2tfm.1 ## Data ## -cfgdatadir = ${prefix}/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = ${prefix}/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc -mapdatadir = ${prefix}/texmf-dist/source/fonts/zhmetrics +mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map -sfddatadir = ${prefix}/texmf-dist/fonts/sfd/ttf2pk +sfddatadir = $(datarootdir)/texmf-dist/fonts/sfd/ttf2pk dist_sfddata_DATA = \ data/Big5.sfd \ data/EUC.sfd \ diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in index da502b2ad40..80d957e744b 100644 --- a/Build/source/texk/ttf2pk2/Makefile.in +++ b/Build/source/texk/ttf2pk2/Makefile.in @@ -319,13 +319,13 @@ ttf2tfm_SOURCES = \ DISTCLEANFILES = config.force GenR-ec.vpl GenR102-* LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -cfgdatadir = ${prefix}/texmf/ttf2pk +cfgdatadir = $(datarootdir)/texmf/ttf2pk dist_cfgdata_DATA = data/VPS.rpl data/ttf2pk.cfg -encdatadir = ${prefix}/texmf/fonts/enc/ttf2pk/base +encdatadir = $(datarootdir)/texmf/fonts/enc/ttf2pk/base dist_encdata_DATA = data/T1-WGL4.enc -mapdatadir = ${prefix}/texmf-dist/source/fonts/zhmetrics +mapdatadir = $(datarootdir)/texmf-dist/source/fonts/zhmetrics dist_mapdata_DATA = data/ttfonts.map -sfddatadir = ${prefix}/texmf-dist/fonts/sfd/ttf2pk +sfddatadir = $(datarootdir)/texmf-dist/fonts/sfd/ttf2pk dist_sfddata_DATA = \ data/Big5.sfd \ data/EUC.sfd \ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3fe995fdba7..a73aabb03fc 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -18483,9 +18483,14 @@ case $enable_native_texlive_build:$enable_tex_synctex in #( yes:no | no:yes | no:no) : ;; #( *) : - enable_tex_synctex=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&2;} ;; + if test -z "$enable_tex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex-synctex=no'" >&5 +$as_echo "$as_me: Assuming \`--enable-tex-synctex=no'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&2;} +fi + enable_tex_synctex=no ;; esac if test "x$enable_tex_synctex" = xyes; then TEX_SYNCTEX_TRUE= @@ -18506,9 +18511,14 @@ case $enable_native_texlive_build:$enable_etex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_etex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_etex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-etex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-etex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_etex_synctex=yes ;; esac if test "x$enable_etex_synctex" = xyes; then ETEX_SYNCTEX_TRUE= @@ -18529,9 +18539,14 @@ case $enable_native_texlive_build:$enable_ptex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_ptex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_ptex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ptex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-ptex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_ptex_synctex=yes ;; esac if test "x$enable_ptex_synctex" = xyes; then PTEX_SYNCTEX_TRUE= @@ -18552,9 +18567,14 @@ case $enable_native_texlive_build:$enable_eptex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_eptex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_eptex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-eptex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-eptex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_eptex_synctex=yes ;; esac if test "x$enable_eptex_synctex" = xyes; then EPTEX_SYNCTEX_TRUE= @@ -18575,9 +18595,14 @@ case $enable_native_texlive_build:$enable_uptex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_uptex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_uptex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-uptex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-uptex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_uptex_synctex=yes ;; esac if test "x$enable_uptex_synctex" = xyes; then UPTEX_SYNCTEX_TRUE= @@ -18598,9 +18623,14 @@ case $enable_native_texlive_build:$enable_euptex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_euptex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_euptex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-euptex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-euptex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_euptex_synctex=yes ;; esac if test "x$enable_euptex_synctex" = xyes; then EUPTEX_SYNCTEX_TRUE= @@ -18628,9 +18658,14 @@ case $enable_native_texlive_build:$enable_pdftex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_pdftex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_pdftex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pdftex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-pdftex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_pdftex_synctex=yes ;; esac if test "x$enable_pdftex_synctex" = xyes; then PDFTEX_SYNCTEX_TRUE= @@ -18658,9 +18693,14 @@ case $enable_native_texlive_build:$enable_xetex_synctex in #( yes:yes | no:yes | no:no) : ;; #( *) : - enable_xetex_synctex=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&5 -$as_echo "$as_me: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&2;} ;; + if test -z "$enable_xetex_synctex"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xetex-synctex=yes'" >&5 +$as_echo "$as_me: Assuming \`--enable-xetex-synctex=yes'" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&5 +$as_echo "$as_me: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&2;} +fi + enable_xetex_synctex=yes ;; esac if test "x$enable_xetex_synctex" = xyes; then XETEX_SYNCTEX_TRUE= diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index 4f80b6ec59a..5a1d106761e 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) ================================================== +2011-12-06 Peter Breitenlohner + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-07-30 Peter Breitenlohner * font-open.[ch] (font_open): Constify `char **' parameter. diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index a20d08bff01..702bd199288 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 Peter Breitenlohner +## Copyright (C) 2009, 2011 Peter Breitenlohner ## 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 = ${prefix}/texmf/xdvi +xdvidir = $(datarootdir)/texmf/xdvi dist_xdvi_DATA = texmf/XDvi -pixmapdir = ${prefix}/texmf/xdvi/pixmap +pixmapdir = $(datarootdir)/texmf/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 47d26898a33..0e5cae443e1 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -439,9 +439,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 = ${prefix}/texmf/xdvi +xdvidir = $(datarootdir)/texmf/xdvi dist_xdvi_DATA = texmf/XDvi -pixmapdir = ${prefix}/texmf/xdvi/pixmap +pixmapdir = $(datarootdir)/texmf/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.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index d68c4b1ffd7..8195d130ad1 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx ================================================= +2011-12-06 Peter Breitenlohner + + * data/Makefile.am: + Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-06 Akira Kakuto * spc_pdfm.c: fix a typo in spc_handler_pdfm_dest(). diff --git a/Build/source/texk/xdvipdfmx/data/Makefile.am b/Build/source/texk/xdvipdfmx/data/Makefile.am index 2d2d8b8d6f2..1d4e57ee607 100644 --- a/Build/source/texk/xdvipdfmx/data/Makefile.am +++ b/Build/source/texk/xdvipdfmx/data/Makefile.am @@ -1,9 +1,9 @@ ## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/data/ ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009, 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## -pkgdatadir = ${prefix}/texmf/dvipdfm +pkgdatadir = $(datarootdir)/texmf/dvipdfm dist_pkgdata_DATA = \ $(srcdir)/CMap/EUC-UCS2 \ $(srcdir)/CMap/UniKSCms-UCS2-H \ -- cgit v1.2.3