5 files changed, 10 insertions, 8 deletions
diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog
index f2d54feb34..1271223835 100644
--- a/c/src/lib/libcpu/i960/ChangeLog
+++ b/c/src/lib/libcpu/i960/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am:
+	Remove H_FILES.
+	* include/Makefile.am:  Apply include_*HEADERS instead of H_FILES.
+
 2000-11-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
diff --git a/c/src/lib/libcpu/i960/i960ca/Makefile.am b/c/src/lib/libcpu/i960/i960ca/Makefile.am
index 223cee6535..b0329618e3 100644
--- a/c/src/lib/libcpu/i960/i960ca/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ca/Makefile.am
@@ -11,8 +11,6 @@ include $(top_srcdir)/../../../../../automake/lib.am
 C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
 OBJS = $(C_O_FILES)
 
 #
diff --git a/c/src/lib/libcpu/i960/i960ka/Makefile.am b/c/src/lib/libcpu/i960/i960ka/Makefile.am
index 2f9cbb7c23..5660ab89e8 100644
--- a/c/src/lib/libcpu/i960/i960ka/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ka/Makefile.am
@@ -11,8 +11,6 @@ include $(top_srcdir)/../../../../../automake/lib.am
 C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
 OBJS = $(C_O_FILES)
 
 #
diff --git a/c/src/lib/libcpu/i960/i960rp/Makefile.am b/c/src/lib/libcpu/i960/i960rp/Makefile.am
index 7d7ec5fad2..40bbd93069 100644
--- a/c/src/lib/libcpu/i960/i960rp/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960rp/Makefile.am
@@ -11,8 +11,6 @@ include $(top_srcdir)/../../../../../automake/lib.am
 C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
 OBJS = $(C_O_FILES)
 
 #
diff --git a/c/src/lib/libcpu/i960/include/Makefile.am b/c/src/lib/libcpu/i960/include/Makefile.am
index 4dfd944732..934b4cad60 100644
--- a/c/src/lib/libcpu/i960/include/Makefile.am
+++ b/c/src/lib/libcpu/i960/include/Makefile.am
@@ -4,7 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = i960CA.h i960HA.h i960KA.h i960RP.h i960JX_RP_common.h
+include_libcpudir = $(includedir)/libcpu
+
+include_libcpu_HEADERS = i960CA.h i960HA.h i960KA.h i960RP.h i960JX_RP_common.h
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -13,7 +15,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
 
 all-local: $(TMPINSTALL_FILES)