From 9b888649e62c7efd7a76b093153f23a145ab8b5a Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 8 Feb 2013 12:05:33 +0000 Subject: build system: Merge texmf into texmf-dist git-svn-id: svn://tug.org/texlive/trunk@29060 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvik/ChangeLog.TL | 4 ++++ Build/source/texk/xdvik/Makefile.am | 6 +++--- Build/source/texk/xdvik/Makefile.in | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/xdvik') 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 + + * Makefile.am (xdvidir, pixmapdir): Change texmf => texmf-dist. + 2012-12-16 Peter Breitenlohner * 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 +## Copyright (C) 2009-2013 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 = $(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 -- cgit v1.2.3