2004-04-03 Ralf Corsepius <ralf_corsepius@rtems.org>

	* Makefile.am: Install m68302.h m68360.h qsm.h sim.h
	to $(includedir)/rtems/m68k.

2 files changed, 24 insertions, 18 deletions

diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index 8b1e812a7b..57e845a5d0 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-03	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* Makefile.am: Install m68302.h m68360.h qsm.h sim.h
+	to $(includedir)/rtems/m68k.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 8d13717a7e..1515e0b047 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -18,7 +18,8 @@ libscorecpu_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = asm.h
 
-include_HEADERS = m68302.h m68360.h qsm.h sim.h
+include_rtems_m68kdir = $(includedir)/rtems/m68k
+include_rtems_m68k_HEADERS = m68302.h m68360.h qsm.h sim.h
 
 include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \
@@ -33,11 +34,6 @@ all-local: $(PREINSTALL_FILES) libscorecpu$(LIB_VARIANT).a
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
@@ -47,21 +43,26 @@ $(PROJECT_INCLUDE)/rtems/asm.h: asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
 
-$(PROJECT_INCLUDE)/m68302.h: m68302.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68302.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68302.h
+$(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/m68k
+	@: > $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/m68k/m68302.h: m68302.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
 
-$(PROJECT_INCLUDE)/m68360.h: m68360.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68360.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68360.h
+$(PROJECT_INCLUDE)/rtems/m68k/m68360.h: m68360.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
 
-$(PROJECT_INCLUDE)/qsm.h: qsm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/qsm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/qsm.h
+$(PROJECT_INCLUDE)/rtems/m68k/qsm.h: qsm.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
 
-$(PROJECT_INCLUDE)/sim.h: sim.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sim.h
+$(PROJECT_INCLUDE)/rtems/m68k/sim.h: sim.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/sim.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/sim.h
 
 $(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score