[rtems commit] zlib: Fix build

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    d19e7aab4bdad8cf617d76adcf460ea53e55bb05
Changeset: http://git.rtems.org/rtems/commit/?id=d19e7aab4bdad8cf617d76adcf460ea53e55bb05

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Dec 13 09:32:11 2017 +0100

zlib: Fix build

Update #3254.

---

 cpukit/Makefile.am        | 1 +
 cpukit/preinstall.am      | 4 ++++
 cpukit/zlib/Makefile.am   | 2 +-
 cpukit/zlib/preinstall.am | 6 +-----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index e9a3730..d317fbb 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -37,6 +37,7 @@ CLEANFILES = preinstall-stamp
 
 include_HEADERS =
 include_HEADERS += include/endian.h
+include_HEADERS += include/zconf.h
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS =
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index 5ee01a8..fd26535 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -22,6 +22,10 @@ $(PROJECT_INCLUDE)/endian.h: include/endian.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/endian.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/endian.h
 
+$(PROJECT_INCLUDE)/zconf.h: include/zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h
+
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am
index 586cf16..0b38ecd 100644
--- a/cpukit/zlib/Makefile.am
+++ b/cpukit/zlib/Makefile.am
@@ -18,7 +18,7 @@ libz_a_SOURCES += zconf.h
 libz_a_SOURCES += zlib.h
 libz_a_SOURCES += zutil.c zutil.h
 
-include_HEADERS = zlib.h zconf.h
+include_HEADERS = zlib.h
 
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/zlib/preinstall.am b/cpukit/zlib/preinstall.am
index 7eb8f7b..799bb7b 100644
--- a/cpukit/zlib/preinstall.am
+++ b/cpukit/zlib/preinstall.am
@@ -11,7 +11,7 @@ DISTCLEANFILES = $(PREINSTALL_DIRS)
 all-am: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
@@ -36,7 +36,3 @@ $(PROJECT_INCLUDE)/zlib.h: zlib.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zlib.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/zlib.h
 
-$(PROJECT_INCLUDE)/zconf.h: zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h
-