summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-02-06 16:41:37 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-02-06 16:41:37 +0000
commit9b116329db958c4f2c132bea699c40ce419627bd (patch)
tree4f2ec272a49d851b7ac2c3218c0ad6d0c300293f
parent5bca94b86e74c96e619f98e7e4884f1227e37262 (diff)
downloadrtems-9b116329db958c4f2c132bea699c40ce419627bd.tar.bz2
2002-02-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/subdirs.m4: Propagate the current $prefix to the sub-configures.
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/subdirs.m46
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d28b80b08..5db3e41cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/subdirs.m4: Propagate the current $prefix to the
+ sub-configures.
+
2002-02-05 Joel Sherrill <joel@OARcorp.com>
* VERSION: Updated to rtems-ss-20020205.
diff --git a/aclocal/subdirs.m4 b/aclocal/subdirs.m4
index fd51d1f231..e48e6e3236 100644
--- a/aclocal/subdirs.m4
+++ b/aclocal/subdirs.m4
@@ -194,10 +194,14 @@ if test "$no_recursion" != yes; then
esac
done
+ # Always prepend --prefix to ensure using the same prefix
+ # in subdir configurations.
+ ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+
case "$$1_subdir" in
"." ) ;;
* )
- ac_sub_configure_args="$ac_sub_configure_args --with-target-subdir=$$1_subdir --exec-prefix=\${prefix}/$$1_subdir"
+ ac_sub_configure_args="$ac_sub_configure_args --with-target-subdir=$$1_subdir --exec-prefix=${prefix}/$$1_subdir"
;;
esac