summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfielding <fielding@13f79535-47bb-0310-9956-ffa450edef68>2001-02-20 03:03:34 +0000
committerfielding <fielding@13f79535-47bb-0310-9956-ffa450edef68>2001-02-20 03:03:34 +0000
commit11d5a8f9b5cd34dd9575dd3adafa2dcd1f495b79 (patch)
tree40801ad7b456c2d17c2c0c42cb9d0cf8b1740a23
parent2849d86837569c25119719163e5cb80d39d46655 (diff)
downloadlibapr-11d5a8f9b5cd34dd9575dd3adafa2dcd1f495b79.tar.gz
make rules (rules.mk) will be in the builddir for vpath, so including
it from the srcdir won't work. Submitted by: Kevin Pilch-Bisson <kevin@pilch-bisson.net> Reviewed by: Roy Fielding git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61264 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--configure.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 99ff15306..9fe826076 100644
--- a/configure.in
+++ b/configure.in
@@ -35,6 +35,9 @@ fi
AC_SUBST(top_builddir)
dnl Directory containing apr build macros, helpers, and make rules
+dnl NOTE: make rules (rules.mk) will be in the builddir for vpath
+dnl
+apr_buildout=$abs_builddir/build
apr_builders=$abs_srcdir/build
AC_SUBST(apr_builders)
@@ -945,14 +948,14 @@ case "$host_alias" in
*bsdi*)
# Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then
- INCLUDE_RULES="include $apr_builders/rules.mk"
+ INCLUDE_RULES="include $apr_buildout/rules.mk"
else
# BSDi make
- INCLUDE_RULES=".include \"$apr_builders/rules.mk\""
+ INCLUDE_RULES=".include \"$apr_buildout/rules.mk\""
fi
;;
*)
- INCLUDE_RULES="include $apr_builders/rules.mk"
+ INCLUDE_RULES="include $apr_buildout/rules.mk"
;;
esac
AC_SUBST(INCLUDE_RULES)