diff options
| -rw-r--r-- | Makefile.in | 15 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 148402d21..6c92393f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,9 @@ + +srcdir=@srcdir@ +VPATH=@srcdir@ +top_srcdir=@apr_srcdir@ +top_blddir=@apr_builddir@ + # # APR (Apache Portable Runtime) library Makefile. # @@ -10,9 +16,9 @@ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ # Macros for supporting directories # INCDIR=./include -OSDIR=$(INCDIR)/arch/@OSDIR@ +OSDIR=$(top_srcdir)/include/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include # # Macros for target determination @@ -45,11 +51,6 @@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ installbuilddir=@installbuilddir@ -srcdir=@srcdir@ -VPATH=@srcdir@ -top_srcdir=@apr_srcdir@ -top_blddir=@apr_builddir@ - # Create apr-config script suitable for the install tree apr-config.out: apr-config diff --git a/configure.in b/configure.in index f38a6136d..d05d64710 100644 --- a/configure.in +++ b/configure.in @@ -1886,16 +1886,16 @@ case $host in # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $apr_buildout/apr_rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk" else # BSDi make INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\"" - INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" + INCLUDE_OUTPUTS=".include \"$apr_srcdir/build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $apr_buildout/apr_rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) |