summaryrefslogtreecommitdiff
path: root/Build/source/texk/ttf2pk2
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/texk/ttf2pk2
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/texk/ttf2pk2')
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog4
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.am8
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.in8
3 files changed, 12 insertions, 8 deletions
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 <peb@mppmu.mpg.de>
+
+ * Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
+
2011-11-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 \