summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik
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/xdvik
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/xdvik')
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL4
-rw-r--r--Build/source/texk/xdvik/Makefile.am6
-rw-r--r--Build/source/texk/xdvik/Makefile.in4
3 files changed, 9 insertions, 5 deletions
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