summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/zlib')
-rw-r--r--Build/source/libs/zlib/ChangeLog4
-rw-r--r--Build/source/libs/zlib/Makefile.am6
-rw-r--r--Build/source/libs/zlib/Makefile.in1
3 files changed, 6 insertions, 5 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 82efbf35c34..1d6cd49c118 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2012-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Use ../../am/rebuild.am.
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 7fce7d03e99..adb52b75c15 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -1,14 +1,12 @@
## Proxy Makefile.am to build zlib for TeX Live.
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
-## We want to re-distribute the whole original zlib source tree.
+## We want to re-distribute the whole zlib source tree.
##
EXTRA_DIST = $(ZLIB_TREE)
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 8e6e0415485..0b2328dd029 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -546,7 +546,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)