diff options
| -rw-r--r-- | cpukit/Makefile.am | 1 | ||||
| -rw-r--r-- | cpukit/preinstall.am | 4 | ||||
| -rw-r--r-- | cpukit/zlib/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/zlib/preinstall.am | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index e9a37300d5..d317fbba1c 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 5ee01a852d..fd26535031 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 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 - |