You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/02/05 12:10:39 UTC
cvs commit: apr configure.in Makefile.in
jorton 2004/02/05 03:10:39
Modified: . configure.in Makefile.in
Log:
VPATH build fixes:
* configure.in: Point at build-outputs.mk in the srcdir.
* Makefile.in: Define top_srcdir and top_blddir etc higher; include
$srcdir/arch/@OSDIR@ and $srcdir/include.
Revision Changes Path
1.569 +3 -3 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.568
retrieving revision 1.569
diff -b -d -u -r1.568 -r1.569
--- configure.in 5 Feb 2004 10:16:20 -0000 1.568
+++ configure.in 5 Feb 2004 11:10:39 -0000 1.569
@@ -1886,16 +1886,16 @@
# 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)
1.93 +8 -7 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -b -d -u -r1.92 -r1.93
--- Makefile.in 5 Feb 2004 10:16:20 -0000 1.92
+++ Makefile.in 5 Feb 2004 11:10:39 -0000 1.93
@@ -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 @@
# 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 @@
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