From e90cff96317fea3b76e2bf2b333049625ebe1b94 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 14 Dec 2003 23:00:58 +0000
Subject: 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
	* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
	* acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
	* Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
---
 c/src/ChangeLog           |  7 +++++++
 c/src/acinclude.m4        | 22 +++++++++-------------
 c/src/automake/compile.am |  4 ++--
 c/src/wrapup/Makefile.am  |  4 ++--
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 5734dbfee3..15df005091 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
+	* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
+	* acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
+	* Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
+
 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* support/Makefile.am: Pass @RTEMS_BSP@ to AM_CPPFLAGS.
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4
index fdf70fb4b0..c99d427695 100644
--- a/c/src/acinclude.m4
+++ b/c/src/acinclude.m4
@@ -5,18 +5,16 @@
 # Note: Consider this file a temporary band-aid until a better, more general
 # subdirectory handling solution is introduced to RTEMS.
 
-AC_DEFUN([RTEMS_CONFIG_SUBDIR],
-[
-AC_CONFIG_COMMANDS_POST(
+AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE],
 [
-if test "$multilib" != "yes"; then
- ac_sub_sourcedir=$2
- ac_sub_builddir=$1
+   RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
+])
 
+AC_DEFUN([RTEMS_CONFIG_SUBDIR],
+[AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE])
 if test "$no_recursion" != yes; then
-  RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
-
-  ac_sub_configure_args="$ac_sub_configure_args $3"
+  ac_sub_sourcedir=$2
+  ac_sub_builddir=$1
 
   for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue
 
@@ -72,9 +70,9 @@ if test "$no_recursion" != yes; then
         ac_sub_cache_file=$ac_dots$cache_file ;;
       esac
 
-      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
+      AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $3 --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
       # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
+      eval $ac_sub_configure $ac_sub_configure_args $3 \
            --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     fi
@@ -82,6 +80,4 @@ if test "$no_recursion" != yes; then
     cd $ac_popdir
   done
 fi
-fi
-])
 ])
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index 8ce22634c4..022b5ecf06 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -139,12 +139,12 @@ depend: depend-am
 
 LINK_OBJS = \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
+    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
 
 LINK_FILES =\
     $(START_FILE) \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
+    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
 
 if RTEMS_USE_GCC
 ## gcc >= 2.8
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index b8c9bec525..6f8384e953 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -24,7 +24,7 @@ if HAS_RDBG
 SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a
 endif
 
-SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a)
+SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
 
 if LIBCHIP
 SRCS += ../libchip/rtc/$(ARCH)/librtcio.a
@@ -36,7 +36,7 @@ endif
 endif
 
 SRCS += $(wildcard \
-    $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
+    $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
 
 all-local: $(TMPINSTALL_FILES)
 
-- 
cgit v1.2.3