build system: New Makefile fragment to `install' headers in the build tree.

git-svn-id: svn://tug.org/texlive/trunk@25493 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 14 insertions, 20 deletions

diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 161481c1ca9..5549477aa2e 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* include/Makefile.am: Use ../am/hdr_links.am.
+
 2012-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ac/zlib.ac: Drop requirement for zlib-1.2.6 or later.
diff --git a/Build/source/libs/zlib/include/Makefile.am b/Build/source/libs/zlib/include/Makefile.am
index b79c908d434..6ee82c6187b 100644
--- a/Build/source/libs/zlib/include/Makefile.am
+++ b/Build/source/libs/zlib/include/Makefile.am
@@ -1,6 +1,6 @@
 ## Proxy Makefile.am to install zlib headers for TeX Live.
 ##
-##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -9,21 +9,9 @@
 ZLIB_SRC = $(top_srcdir)/$(ZLIB_TREE)
 ZLIB_BLD = $(top_builddir)
 
-ZLIB_HDRS = \
+hdr_links = \
 	$(ZLIB_SRC)/zlib.h \
 	$(ZLIB_BLD)/zconf.h
 
-all-local:
-	@for file in $(ZLIB_HDRS); do \
-	  test -f $$file || continue; \
-	  inst=`echo $$file | sed -e 's/^.*\///'`; \
-	  test -f $$inst || { \
-	    echo "$(LN_S) $$file $$inst"; \
-	    $(LN_S) $$file $$inst; } || exit 1; \
-	done
-
-distclean-local:
-	rm -f *.h
-
-
+include $(top_srcdir)/../am/hdr_links.am
 
diff --git a/Build/source/libs/zlib/include/Makefile.in b/Build/source/libs/zlib/include/Makefile.in
index efabec4a9b7..cf07a57aef0 100644
--- a/Build/source/libs/zlib/include/Makefile.in
+++ b/Build/source/libs/zlib/include/Makefile.in
@@ -31,8 +31,9 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/../am/hdr_links.am
 subdir = include
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
@@ -138,14 +139,14 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ZLIB_SRC = $(top_srcdir)/$(ZLIB_TREE)
 ZLIB_BLD = $(top_builddir)
-ZLIB_HDRS = \
+hdr_links = \
 	$(ZLIB_SRC)/zlib.h \
 	$(ZLIB_BLD)/zconf.h
 
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -166,6 +167,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/../am/hdr_links.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -325,12 +327,12 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am
 
-
 all-local:
-	@for file in $(ZLIB_HDRS); do \
+	@for file in $(hdr_links); do \
 	  test -f $$file || continue; \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
 	  test -f $$inst || { \
+	    rm -f $$inst; \
 	    echo "$(LN_S) $$file $$inst"; \
 	    $(LN_S) $$file $$inst; } || exit 1; \
 	done