From 58908fc82af48fac78343a344c3043c1cc420389 Mon Sep 17 00:00:00 2001
From: jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Feb 2004 11:10:39 +0000
Subject: 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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64894 13f79535-47bb-0310-9956-ffa450edef68
---
 Makefile.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Makefile.in')

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
-- 
cgit v1.2.1