From f969fcb7bb439e01c5a9f50d701bddce5ef3ac7e Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 17 Feb 2009 12:43:53 +0000
Subject: [PATCH] =?UTF-8?q?2009-02-17=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* Makefile.am: Fix breakage introduced in 2009-02-13 changes.
---
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am   |  5 +++--
 c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 10 +++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 45dbd3d4df..c15e602995 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -19,14 +19,15 @@ dist_project_lib_DATA = bsp_specs
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.include_bsp_HEADERS +=
+include_HEADERS = include/bsp.h
 
 nodist_include_HEADERS = include/bspopts.h
 
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
-include_bsp_HEADERS  = ../../shared/include/utility.h
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../shared/include/utility.h
 include_bsp_HEADERS += ../../shared/include/irq-generic.h
 include_bsp_HEADERS += ../../shared/tod.h
 include_bsp_HEADERS += ../shared/include/linker-symbols.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
index 99ccb275da..72fd499888 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
@@ -37,13 +37,9 @@ $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
 PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
 
-$(PROJECT_INCLUDE)/bsp.include_bsp_HEADERS: include/bsp.include_bsp_HEADERS $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.include_bsp_HEADERS
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.include_bsp_HEADERS
-
-$(PROJECT_INCLUDE)/+=: += $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/+=
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/+=
+$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
 
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h