summaryrefslogtreecommitdiff
path: root/Build/source/texk/ttf2pk2
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-02-08 12:05:33 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-02-08 12:05:33 +0000
commit9b888649e62c7efd7a76b093153f23a145ab8b5a (patch)
treea6697745e2583fee70566b85a6f89ef24b05af45 /Build/source/texk/ttf2pk2
parent5335b097801ae55377defd39dbcb2c66b7cab052 (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/source/texk/ttf2pk2')
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog4
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.am6
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.in4
3 files changed, 9 insertions, 5 deletions
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