diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-12-06 14:50:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-12-06 14:50:09 +0000 |
commit | 6c7ac04da0ed0c0bcf3f63106addbd66c35d7388 (patch) | |
tree | 3bed1702a43b35d9ba17f669a343c35baf947691 /Build/source/texk/tetex | |
parent | d4098ae6af4055044c234a33fc9f42b2e4638999 (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/texk/tetex')
-rw-r--r-- | Build/source/texk/tetex/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/tetex/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/tetex/Makefile.in | 6 |
3 files changed, 10 insertions, 6 deletions
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 <peb@mppmu.mpg.de> + + * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf. + 2011-11-16 Norbert Preining <preining@logic.at> * 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 \ |