From d19e7aab4bdad8cf617d76adcf460ea53e55bb05 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 13 Dec 2017 09:32:11 +0100 Subject: zlib: Fix build Update #3254. --- cpukit/zlib/Makefile.am | 2 +- cpukit/zlib/preinstall.am | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'cpukit/zlib') diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am index 586cf16c4c..0b38ecd5c2 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 7eb8f7b6f1..799bb7b442 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 - -- cgit v1.2.3