From 6dcc0f4ed7acb77d66ffdf6f3417776e651793d9 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 12 Dec 2003 15:34:16 +0000
Subject: 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Use mkdir_p.
	Remove dirs from PRE/TMPINSTALL_FILES.
	* bsp.am: Replace bsplibdir by project_libdir.
	Use mkdir_p instead of mkinstalldirs.
	Remove dirs from PRE/TMPINSTALL_FILES.
---
 c/src/lib/libbsp/ChangeLog   |  8 ++++++++
 c/src/lib/libbsp/Makefile.am |  9 ++++++---
 c/src/lib/libbsp/bsp.am      | 16 ++++++++--------
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'c/src')

diff --git a/c/src/lib/libbsp/ChangeLog b/c/src/lib/libbsp/ChangeLog
index 9eb2317014..5037c99bd9 100644
--- a/c/src/lib/libbsp/ChangeLog
+++ b/c/src/lib/libbsp/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Use mkdir_p.
+	Remove dirs from PRE/TMPINSTALL_FILES.
+	* bsp.am: Replace bsplibdir by project_libdir.
+	Use mkdir_p instead of mkinstalldirs.
+	Remove dirs from PRE/TMPINSTALL_FILES.
+
 2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp.am: Remove project_libdir.
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index e7a59d2c44..9c701fb8ba 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -37,7 +37,7 @@ shmdr_OBJS = $(shmdr_C_FILES:shmdr/%.c=shmdr/$(ARCH)/%.$(OBJEXT))
 #   ../$(RTEMS_BSP_FAMILY)/wrapup/Makefile
 
 shmdr/$(ARCH)/$(dirstamp):
-	@$(mkinstalldirs) shmdr/$(ARCH)
+	@$(mkdir_p) shmdr/$(ARCH)
 	@: > shmdr/$(ARCH)/$(dirstamp)
 shmdr/$(ARCH)/%.$(OBJEXT): shmdr/%.c shmdr/$(ARCH)/$(dirstamp)
 	${COMPILE} -o $@ -c $<
@@ -59,9 +59,12 @@ EXTRA_DIST += shmdr/README shmdr/addlq.c shmdr/cnvpkt.c shmdr/dump.c \
 PREINSTALL_FILES =
 
 $(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+${PROJECT_RELEASE}/lib/$(dirstamp):
+	@$(mkdir_p) ${PROJECT_RELEASE}/lib
+	@: > ${PROJECT_RELEASE}/lib/$(dirstamp)
 
 if HAS_MP
 $(PROJECT_INCLUDE)/shm_driver.h: shmdr/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
diff --git a/c/src/lib/libbsp/bsp.am b/c/src/lib/libbsp/bsp.am
index 16d55a7fbd..7cf883db67 100644
--- a/c/src/lib/libbsp/bsp.am
+++ b/c/src/lib/libbsp/bsp.am
@@ -2,24 +2,24 @@
 ## $Id$
 ##
 
-dist_bsplib_DATA = bsp_specs
+dist_project_lib_DATA = bsp_specs
 
 include_HEADERS  = include/bsp.h
 nodist_include_HEADERS = include/bspopts.h
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp):
-	@$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib
-	@: > $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
-PREINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
+PREINSTALL_FILES =
+
+$(PROJECT_RELEASE)/lib/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_RELEASE)/lib
+	@: > $(PROJECT_RELEASE)/lib/$(dirstamp)
 
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
+$(PROJECT_RELEASE)/lib/bsp_specs: bsp_specs $(PROJECT_RELEASE)/lib/$(dirstamp)
 	$(INSTALL_DATA) $< $@
-PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
+PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/bsp_specs
 
 $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
-- 
cgit v1.2.3