summaryrefslogtreecommitdiff
path: root/Build/source/texk/makeindexk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:56:23 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:56:23 +0000
commit081d7946faa61fc306f13b99d8e6af921d1af111 (patch)
treef2febc9b4dd87f26e62fdad37390e7e1d49ddb1b /Build/source/texk/makeindexk
parent508bffe4408ab137d9057b15075c94e1578b619d (diff)
texk/*/: Drop the obsolete ACLOCAL_AMFLAGS
git-svn-id: svn://tug.org/texlive/trunk@34287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makeindexk')
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rw-r--r--Build/source/texk/makeindexk/Makefile.am4
-rw-r--r--Build/source/texk/makeindexk/Makefile.in1
-rwxr-xr-xBuild/source/texk/makeindexk/configure2
4 files changed, 6 insertions, 5 deletions
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index e8ddd5fee3b..7fd091ce39e 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Use KPSE_COND_WIN32.
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index 4580372e209..2d194634627 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -1,10 +1,8 @@
## Makefile.am for the TeX Live subdirectory texk/makeindexk/
##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index 372c23f588d..d1df37f1597 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -538,7 +538,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
@WIN32_FALSE@dist_bin_SCRIPTS = mkindex
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index 525e479d64f..58ff450545f 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -12911,7 +12911,7 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
-$as_echo "#define TEX_LIVE_VERSION \"2014\"" >>confdefs.h
+$as_echo "#define TEX_LIVE_VERSION \"2015/dev\"" >>confdefs.h
for ac_header in ctype.h types.h locale.h