summaryrefslogtreecommitdiff
path: root/Build/source/utils/texdoctk
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/utils/texdoctk
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/utils/texdoctk')
-rw-r--r--Build/source/utils/texdoctk/ChangeLog4
-rw-r--r--Build/source/utils/texdoctk/Makefile.am4
-rw-r--r--Build/source/utils/texdoctk/Makefile.in2
3 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog
index f0723c3e9f2..c301afb7021 100644
--- a/Build/source/utils/texdoctk/ChangeLog
+++ b/Build/source/utils/texdoctk/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (scriptsdir): Change texmf => texmf-dist.
+
2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Use KPSE_COND_WIN32_WRAP for win32 wrappers.
diff --git a/Build/source/utils/texdoctk/Makefile.am b/Build/source/utils/texdoctk/Makefile.am
index 3d38b3af774..b33291b547d 100644
--- a/Build/source/utils/texdoctk/Makefile.am
+++ b/Build/source/utils/texdoctk/Makefile.am
@@ -2,7 +2,7 @@
## (In a separate directory because we hope that some day a new
## volunteer will appear to take over this program.)
##
-## Copyright (C) 2012 Karl Berry <tex-live@tug.org>
+## Copyright (C) 2012, 2013 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST =
perl_scripts = texdoctk
-scriptsdir = texmf/scripts/texdoctk
+scriptsdir = texmf-dist/scripts/texdoctk
nodist_bin_SCRIPTS =
#
include $(srcdir)/../../texk/am/script_links.am
diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in
index d70a67ca316..fcabfa499d5 100644
--- a/Build/source/utils/texdoctk/Makefile.in
+++ b/Build/source/utils/texdoctk/Makefile.in
@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(top_builddir)/../../build-aux/relpath
perl_scripts = texdoctk
-scriptsdir = texmf/scripts/texdoctk
+scriptsdir = texmf-dist/scripts/texdoctk
nodist_bin_SCRIPTS = $(am__append_1)
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)