4 files changed, 26 insertions, 26 deletions
diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am
index 363223b878..76d08e35a7 100644
--- a/c/src/lib/include/Makefile.am
+++ b/c/src/lib/include/Makefile.am
@@ -4,12 +4,12 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
+H_FILES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
     timerdrv.h vmeintr.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -18,9 +18,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = sys motorola zilog
 
diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am
index 498d5b6def..91323785d8 100644
--- a/c/src/lib/include/motorola/Makefile.am
+++ b/c/src/lib/include/motorola/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = mc68230.h mc68681.h
+H_FILES = mc68230.h mc68681.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/motorola \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
 
@@ -17,8 +17,8 @@ $(PROJECT_INCLUDE)/motorola:
 $(PROJECT_INCLUDE)/motorola/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am
index 2f912276a2..a43a93216d 100644
--- a/c/src/lib/include/sys/Makefile.am
+++ b/c/src/lib/include/sys/Makefile.am
@@ -6,19 +6,19 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_NETWORKING
 else
-NETWORKING_H_PIECES += ioctl.h
+NETWORKING_H_FILES += ioctl.h
 endif
 
 if UNIX
 else
-NEWLIB_H_PIECES += termios.h
+NEWLIB_H_FILES += termios.h
 endif
 
-H_PIECES += utime.h $(NEWLIB_H_PIECES) $(NETWORKING_H_PIECES)
+H_FILES += utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/sys \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
 
@@ -27,8 +27,8 @@ $(PROJECT_INCLUDE)/sys:
 $(PROJECT_INCLUDE)/sys/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am
index 8dcef9893c..ec750d0097 100644
--- a/c/src/lib/include/zilog/Makefile.am
+++ b/c/src/lib/include/zilog/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = z8036.h z8530.h z8536.h
+H_FILES = z8036.h z8530.h z8536.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/zilog \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
 
@@ -17,8 +17,8 @@ $(PROJECT_INCLUDE)/zilog:
 $(PROJECT_INCLUDE)/zilog/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am