10 files changed, 199 insertions, 158 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog
index 24016f0330..6fb4dd484d 100644
--- a/cpukit/libblock/ChangeLog
+++ b/cpukit/libblock/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+
 2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reworked.
diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am
index f3c5813488..d787a11191 100644
--- a/cpukit/libblock/Makefile.am
+++ b/cpukit/libblock/Makefile.am
@@ -32,28 +32,29 @@ all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/rtems:
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
 
-$(PROJECT_INCLUDE)/rtems/blkdev.h: include/rtems/blkdev.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/blkdev.h: include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
 
-$(PROJECT_INCLUDE)/rtems/diskdevs.h: include/rtems/diskdevs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/diskdevs.h: include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
 
-$(PROJECT_INCLUDE)/rtems/ramdisk.h: include/rtems/ramdisk.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/ramdisk.h: include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
 
-$(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog
index a2304b2797..f513a5f7d7 100644
--- a/cpukit/libcsupport/ChangeLog
+++ b/cpukit/libcsupport/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+
 2003-11-26	Joel Sherrill <joel@OARcorp.com>
 
 	PR 524/filesystem
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index b433b56e13..df76e5c9de 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -147,152 +147,161 @@ BUILT_SOURCES = $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/chain.h: include/chain.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/chain.h: include/chain.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/chain.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/chain.h
 
-$(PROJECT_INCLUDE)/console.h: include/console.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/console.h: include/console.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/console.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/console.h
 
-$(PROJECT_INCLUDE)/clockdrv.h: include/clockdrv.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/clockdrv.h: include/clockdrv.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/clockdrv.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/clockdrv.h
 
-$(PROJECT_INCLUDE)/iosupp.h: include/iosupp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/iosupp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/iosupp.h
 
-$(PROJECT_INCLUDE)/ringbuf.h: include/ringbuf.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ringbuf.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/ringbuf.h
 
-$(PROJECT_INCLUDE)/rtc.h: include/rtc.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtc.h: include/rtc.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtc.h
 
-$(PROJECT_INCLUDE)/spurious.h: include/spurious.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spurious.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/spurious.h
 
-$(PROJECT_INCLUDE)/timerdrv.h: include/timerdrv.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/timerdrv.h: include/timerdrv.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/timerdrv.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/timerdrv.h
 
-$(PROJECT_INCLUDE)/vmeintr.h: include/vmeintr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vmeintr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/vmeintr.h
 
 if NEED_STDINT_H
-$(PROJECT_INCLUDE)/stdint.h: include/stdint.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/stdint.h: include/stdint.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/stdint.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/stdint.h
 endif
 
 if NEED_INTTYPES_H
-$(PROJECT_INCLUDE)/inttypes.h: include/inttypes.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/inttypes.h: include/inttypes.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/inttypes.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/inttypes.h
 endif
 
-$(PROJECT_INCLUDE)/motorola:
+$(PROJECT_INCLUDE)/motorola/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/motorola
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola
+	@: > $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/$(dirstamp)
 
-$(PROJECT_INCLUDE)/motorola/mc68230.h: include/motorola/mc68230.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/motorola/mc68230.h: include/motorola/mc68230.h $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68230.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68230.h
 
-$(PROJECT_INCLUDE)/motorola/mc68681.h: include/motorola/mc68681.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/motorola/mc68681.h: include/motorola/mc68681.h $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68681.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68681.h
 
-$(PROJECT_INCLUDE)/rtems:
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/assoc.h
 
-$(PROJECT_INCLUDE)/rtems/error.h: include/rtems/error.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/error.h: include/rtems/error.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/error.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/error.h
 
-$(PROJECT_INCLUDE)/rtems/libcsupport.h: include/rtems/libcsupport.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/libcsupport.h: include/rtems/libcsupport.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libcsupport.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libcsupport.h
 
-$(PROJECT_INCLUDE)/rtems/libio.h: include/rtems/libio.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/libio.h: include/rtems/libio.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio.h
 
-$(PROJECT_INCLUDE)/rtems/libio_.h: include/rtems/libio_.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/libio_.h: include/rtems/libio_.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio_.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio_.h
 
-$(PROJECT_INCLUDE)/rtems/termiostypes.h: include/rtems/termiostypes.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/termiostypes.h: include/rtems/termiostypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termiostypes.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termiostypes.h
 
-$(PROJECT_INCLUDE)/rtems/cdefs.h: include/rtems/cdefs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/cdefs.h: include/rtems/cdefs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cdefs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cdefs.h
 
-$(PROJECT_INCLUDE)/sys:
+$(PROJECT_INCLUDE)/sys/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/sys
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys
+	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/$(dirstamp)
 
-$(PROJECT_INCLUDE)/sys/filio.h: include/sys/filio.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/filio.h: include/sys/filio.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/filio.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/filio.h
 
-$(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h
 
-$(PROJECT_INCLUDE)/sys/ioctl.h: include/sys/ioctl.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/ioctl.h: include/sys/ioctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioctl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioctl.h
 
-$(PROJECT_INCLUDE)/sys/sockio.h: include/sys/sockio.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/sockio.h: include/sys/sockio.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/sockio.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/sockio.h
 
-$(PROJECT_INCLUDE)/sys/ttycom.h: include/sys/ttycom.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/ttycom.h: include/sys/ttycom.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttycom.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttycom.h
 
 if NEWLIB
-$(PROJECT_INCLUDE)/sys/termios.h: include/sys/termios.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/termios.h: include/sys/termios.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/termios.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/termios.h
 
-$(PROJECT_INCLUDE)/sys/utsname.h: include/sys/utsname.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/utsname.h: include/sys/utsname.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h
 endif
 
 if NEED_SYS_CDEFS_H
-$(PROJECT_INCLUDE)/sys/cdefs.h: include/sys/cdefs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/cdefs.h: include/sys/cdefs.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/cdefs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/cdefs.h
 endif
 
-$(PROJECT_INCLUDE)/zilog:
+$(PROJECT_INCLUDE)/zilog/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/zilog
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog
+	@: > $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/$(dirstamp)
 
-$(PROJECT_INCLUDE)/zilog/z8036.h: include/zilog/z8036.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/zilog/z8036.h: include/zilog/z8036.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8036.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8036.h
 
-$(PROJECT_INCLUDE)/zilog/z8530.h: include/zilog/z8530.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/zilog/z8530.h: include/zilog/z8530.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8530.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8530.h
 
-$(PROJECT_INCLUDE)/zilog/z8536.h: include/zilog/z8536.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/zilog/z8536.h: include/zilog/z8536.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8536.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8536.h
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 4cf280791f..b227cd2613 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+
 2003-11-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Merge-in src/Makefile.am, src/imfs/Makefile.am,
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index d13e11fb71..bb1e43a77b 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -89,19 +89,24 @@ all-local: $(IMFSLIB) $(DOSFSLIB)
 
 EXTRA_DIST += $(libdosfs_DOSFS_C_FILES) $(libdosfs_FATFS_C_FILES)
 
-CLEANDIRS += src
+CLEANDIRS = src
 
 # ---
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/imfs.h: src/imfs/imfs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/imfs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/imfs.h
 
 if !UNIX
-$(PROJECT_INCLUDE)/dosfs.h: src/dosfs/dosfs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dosfs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/dosfs.h
 endif
 
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 8d366fce35..c3d569182f 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+
 2003-11-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reformat.
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index dfcbd7fdb4..f01985397f 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -293,80 +293,86 @@ CLEANDIRS = */$(ARCH)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/rtems:
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rtems/capture.h: capture/capture.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/capture.h: capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture.h
 
-$(PROJECT_INCLUDE)/rtems/capture-cli.h: capture/capture-cli.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/capture-cli.h: capture/capture-cli.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture-cli.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture-cli.h
 
-$(PROJECT_INCLUDE)/rtems/cpuuse.h: cpuuse/cpuuse.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/cpuuse.h: cpuuse/cpuuse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cpuuse.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cpuuse.h
 
-$(PROJECT_INCLUDE)/rtems/devnull.h: devnull/devnull.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/devnull.h: devnull/devnull.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devnull.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devnull.h
 
-$(PROJECT_INCLUDE)/rtems/dumpbuf.h: dumpbuf/dumpbuf.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/dumpbuf.h: dumpbuf/dumpbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dumpbuf.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dumpbuf.h
 
-$(PROJECT_INCLUDE)/rtems/monitor.h: monitor/monitor.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/monitor.h: monitor/monitor.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/monitor.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/monitor.h
 
-$(PROJECT_INCLUDE)/rtems/mw_fb.h: mw-fb/mw_fb.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/mw_fb.h: mw-fb/mw_fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_fb.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_fb.h
 
-$(PROJECT_INCLUDE)/rtems/mw_uid.h: mw-fb/mw_uid.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/mw_uid.h: mw-fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_uid.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_uid.h
 
 if LIBSHELL
-$(PROJECT_INCLUDE)/rtems/shell.h: shell/shell.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/shell.h: shell/shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/shell.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/shell.h
 endif
 
-$(PROJECT_INCLUDE)/rtems/rtmonuse.h: rtmonuse/rtmonuse.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtmonuse.h: rtmonuse/rtmonuse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtmonuse.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtmonuse.h
 
 if LIBSERDBG
-$(PROJECT_INCLUDE)/serdbgcnf.h: serdbg/serdbgcnf.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/serdbgcnf.h: serdbg/serdbgcnf.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/serdbgcnf.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/serdbgcnf.h
 
-$(PROJECT_INCLUDE)/serdbg.h: serdbg/serdbg.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/serdbg.h: serdbg/serdbg.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/serdbg.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/serdbg.h
 
-$(PROJECT_INCLUDE)/termios_printk_cnf.h: serdbg/termios_printk_cnf.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/termios_printk_cnf.h: serdbg/termios_printk_cnf.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/termios_printk_cnf.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/termios_printk_cnf.h
 
-$(PROJECT_INCLUDE)/termios_printk.h: serdbg/termios_printk.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/termios_printk.h: serdbg/termios_printk.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/termios_printk.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/termios_printk.h
 endif
 
-$(PROJECT_INCLUDE)/rtems/stackchk.h: stackchk/stackchk.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/stackchk.h: stackchk/stackchk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stackchk.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stackchk.h
 
-$(PROJECT_INCLUDE)/rtems/untar.h: untar/untar.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/untar.h: untar/untar.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/untar.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/untar.h
 
-$(PROJECT_INCLUDE)/rtems/fsmount.h: fsmount/fsmount.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/fsmount.h: fsmount/fsmount.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog
index e4504bf457..a54c222cd4 100644
--- a/cpukit/librpc/ChangeLog
+++ b/cpukit/librpc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+
 2003-11-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* src/rpc/Makefile.am, src/xdr/Makefile.am, src/Makefile.am:
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index fa92dd94e7..9c8140d89a 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -93,78 +93,78 @@ EXTRA_DIST += $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES)
 EXTRA_DIST += src/rpc/PSD.doc/nfs.rfc.ms src/rpc/PSD.doc/rpc.prog.ms \
     src/rpc/PSD.doc/rpc.rfc.ms src/rpc/PSD.doc/rpcgen.ms \
     src/rpc/PSD.doc/xdr.nts.ms src/rpc/PSD.doc/xdr.rfc.ms
-
 endif
 
 PREINSTALL_FILES =
 
 if LIBRPC
-$(PROJECT_INCLUDE)/rpc:
+$(PROJECT_INCLUDE)/rpc/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rpc
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc
+	@: > $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rpc/auth.h: include/rpc/auth.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/auth.h: include/rpc/auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth.h
 
-$(PROJECT_INCLUDE)/rpc/auth_des.h: include/rpc/auth_des.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/auth_des.h: include/rpc/auth_des.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth_des.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_des.h
 
-$(PROJECT_INCLUDE)/rpc/auth_unix.h: include/rpc/auth_unix.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/auth_unix.h: include/rpc/auth_unix.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth_unix.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_unix.h
 
-$(PROJECT_INCLUDE)/rpc/clnt.h: include/rpc/clnt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/clnt.h: include/rpc/clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt.h
 
-$(PROJECT_INCLUDE)/rpc/des.h: include/rpc/des.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/des.h: include/rpc/des.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/des.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/des.h
 
-$(PROJECT_INCLUDE)/rpc/des_crypt.h: include/rpc/des_crypt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/des_crypt.h: include/rpc/des_crypt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/des_crypt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/des_crypt.h
 
-$(PROJECT_INCLUDE)/rpc/pmap_clnt.h: include/rpc/pmap_clnt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/pmap_clnt.h: include/rpc/pmap_clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
 
-$(PROJECT_INCLUDE)/rpc/pmap_prot.h: include/rpc/pmap_prot.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/pmap_prot.h: include/rpc/pmap_prot.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_prot.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_prot.h
 
-$(PROJECT_INCLUDE)/rpc/pmap_rmt.h: include/rpc/pmap_rmt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/pmap_rmt.h: include/rpc/pmap_rmt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
 
-$(PROJECT_INCLUDE)/rpc/rpc.h: include/rpc/rpc.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/rpc.h: include/rpc/rpc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc.h
 
-$(PROJECT_INCLUDE)/rpc/rpc_com.h: include/rpc/rpc_com.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/rpc_com.h: include/rpc/rpc_com.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_com.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_com.h
 
-$(PROJECT_INCLUDE)/rpc/rpc_msg.h: include/rpc/rpc_msg.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/rpc_msg.h: include/rpc/rpc_msg.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_msg.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_msg.h
 
-$(PROJECT_INCLUDE)/rpc/svc.h: include/rpc/svc.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/svc.h: include/rpc/svc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc.h
 
-$(PROJECT_INCLUDE)/rpc/svc_auth.h: include/rpc/svc_auth.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/svc_auth.h: include/rpc/svc_auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc_auth.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_auth.h
 
-$(PROJECT_INCLUDE)/rpc/types.h: include/rpc/types.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/types.h: include/rpc/types.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/types.h
 
-$(PROJECT_INCLUDE)/rpc/xdr.h: include/rpc/xdr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rpc/xdr.h: include/rpc/xdr.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/xdr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/xdr.h
 
 endif