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/chktex/ChangeLog | 5 +++++ Build/source/texk/chktex/Makefile.am | 6 +++--- Build/source/texk/chktex/Makefile.in | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'Build/source/texk/chktex') diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index 904db2ad79f..847f6de7362 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Peter Breitenlohner + + * Makefile.am (configdir, pdfdocdir, scriptsdir): + Change texmf => texmf-dist. + 2013-01-30 Peter Breitenlohner * Makefile.am, configure.ac: Allow subdir-objects. diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 1e2059fce77..46d469e11b9 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -74,7 +74,7 @@ man_MANS = \ # scripts perl_scripts = deweb sh_scripts = chkweb -scriptsdir = texmf/scripts/chktex +scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = include $(srcdir)/../../texk/am/script_links.am @@ -87,12 +87,12 @@ install-data-hook: install-perl-links install-sh-links uninstall-hook: uninstall-links # resource file -configdir = $(datarootdir)/texmf/chktex +configdir = $(datarootdir)/texmf-dist/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = $(datarootdir)/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 29fc7f2fb0f..f4952e564fa 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -562,7 +562,7 @@ man_MANS = \ # scripts perl_scripts = deweb sh_scripts = chkweb -scriptsdir = texmf/scripts/chktex +scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = $(am__append_2) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) @@ -572,11 +572,11 @@ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh # resource file -configdir = $(datarootdir)/texmf/chktex +configdir = $(datarootdir)/texmf-dist/chktex config_DATA = $(CHKTEX_TREE)/chktexrc # documentation -pdfdocdir = $(datarootdir)/texmf/doc/chktex +pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf CLEANFILES = $(nodist_bin_SCRIPTS) chktest TESTS = chktex.test -- cgit v1.2.3