diff options
Diffstat (limited to 'Build/source/texk/texlive')
-rw-r--r-- | Build/source/texk/texlive/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/texlive/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/texlive/Makefile.in | 1 | ||||
-rwxr-xr-x | Build/source/texk/texlive/configure | 20 |
4 files changed, 15 insertions, 14 deletions
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index 3e2882b38a3..dd58da44659 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-12-19 Peter Breitenlohner <peb@mppmu.mpg.de> * ac/texlive.ac: New file for '--disable-linked-scripts'. diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am index 1797a8ee168..3b617605028 100644 --- a/Build/source/texk/texlive/Makefile.am +++ b/Build/source/texk/texlive/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/texlive/ ## -## Copyright (C) 2009-2013 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 - SUBDIRS = tl_scripts if LINKED_SCRIPTS SUBDIRS += linked_scripts diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in index 51e603d33a4..08cde43a943 100644 --- a/Build/source/texk/texlive/Makefile.in +++ b/Build/source/texk/texlive/Makefile.in @@ -486,7 +486,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = tl_scripts $(am__append_1) EXTRA_DIST = w32_wrapper $(TESTS) TESTS = tests/updmap-cmdline-test.pl diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 03c3d48ff5e..3a2d6da9e44 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2014. +# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2015/dev. # # Report bugs to <tex-k@tug.org>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live Scripts' PACKAGE_TARNAME='tex-live-scripts' -PACKAGE_VERSION='2014' -PACKAGE_STRING='TeX Live Scripts 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='TeX Live Scripts 2015/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1237,7 +1237,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live Scripts 2014 to adapt to many kinds of systems. +\`configure' configures TeX Live Scripts 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live Scripts 2014:";; + short | recursive ) echo "Configuration of TeX Live Scripts 2015/dev:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live Scripts configure 2014 +TeX Live Scripts configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1454,7 +1454,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live Scripts $as_me 2014, which was +It was created by TeX Live Scripts $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2321,7 +2321,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-scripts' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -4188,7 +4188,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live Scripts $as_me 2014, which was +This file was extended by TeX Live Scripts $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4245,7 +4245,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live Scripts config.status 2014 +TeX Live Scripts config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |