From bd7dc66b41c1232a8b11cbcefad8af05eb908d71 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 13 Dec 2003 05:23:42 +0000
Subject: 2003-12-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
---
 c/src/optman/ChangeLog   |  4 +++
 c/src/optman/Makefile.am | 78 ++++++++++++++++++++++++------------------------
 2 files changed, 43 insertions(+), 39 deletions(-)

(limited to 'c/src/optman')

diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog
index d12300759c..52cbb2b361 100644
--- a/c/src/optman/ChangeLog
+++ b/c/src/optman/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
+
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index a663899f0d..01be74af2b 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -40,56 +40,56 @@ all-local: $(PGMS) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES)
 
-${PROJECT_RELEASE}/lib/$(dirstamp):
-	@$(mkdir_p) ${PROJECT_RELEASE}/lib
-	@: > ${PROJECT_RELEASE}/lib/$(dirstamp)
+$(PROJECT_LIB)/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_LIB)
+	@: > $(PROJECT_LIB)/$(dirstamp)
 
-${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel: $(ARCH)/no-ext$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: $(ARCH)/no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-io$(LIB_VARIANT).rel: $(ARCH)/no-io$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-io$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-io$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-io$(LIB_VARIANT).rel: $(ARCH)/no-io$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-dpmem$(LIB_VARIANT).rel: $(ARCH)/no-dpmem$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-dpmem$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-dpmem$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel: $(ARCH)/no-dpmem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-event$(LIB_VARIANT).rel: $(ARCH)/no-event$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-event$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-event$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-event$(LIB_VARIANT).rel: $(ARCH)/no-event$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-msg$(LIB_VARIANT).rel: $(ARCH)/no-msg$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-msg$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-msg$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel: $(ARCH)/no-msg$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-mp$(LIB_VARIANT).rel: $(ARCH)/no-mp$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-mp$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-mp$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel: $(ARCH)/no-mp$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-part$(LIB_VARIANT).rel: $(ARCH)/no-part$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-part$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-part$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-part$(LIB_VARIANT).rel: $(ARCH)/no-part$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-region$(LIB_VARIANT).rel: $(ARCH)/no-region$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-region$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-region$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-region$(LIB_VARIANT).rel: $(ARCH)/no-region$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-rtmon$(LIB_VARIANT).rel: $(ARCH)/no-rtmon$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-rtmon$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-rtmon$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel: $(ARCH)/no-rtmon$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-sem$(LIB_VARIANT).rel: $(ARCH)/no-sem$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-sem$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-sem$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel: $(ARCH)/no-sem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-signal$(LIB_VARIANT).rel: $(ARCH)/no-signal$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-signal$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-signal$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel: $(ARCH)/no-signal$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
 
-${PROJECT_RELEASE}/lib/no-timer$(LIB_VARIANT).rel: $(ARCH)/no-timer$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
-	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-timer$(LIB_VARIANT).rel
-TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-timer$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: $(ARCH)/no-timer$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
 
 include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3