summaryrefslogtreecommitdiff
path: root/uri
diff options
context:
space:
mode:
authorjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2002-01-04 21:54:50 +0000
committerjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2002-01-04 21:54:50 +0000
commitac3e3975065480fe0ca605f99ab9529f9aa48f7a (patch)
tree63fb96a8d52c84c97dc8b8ab1959b73453ee91fb /uri
parent01f8f3da43c74cbdfc34dc03c968654364358780 (diff)
downloadlibapr-util-ac3e3975065480fe0ca605f99ab9529f9aa48f7a.tar.gz
Fix up VPATH support so that it will survive config.status invocations.
- Add srcdir, VPATH, and top_srcdir to all Makefile.in's - Remove configure.in hack to add srcdir and VPATH to all Makefiles - Rely on APR_INCLUDES for APR's path. (Should switch to find_apr.m4 ASAP) - Make all INCLUDES paths relative to top_srcdir/top_builddir rather than relying on ../../../../ (way too confusing to maintain) git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58505 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'uri')
-rw-r--r--uri/Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/uri/Makefile.in b/uri/Makefile.in
index b966ffee..c5f760a1 100644
--- a/uri/Makefile.in
+++ b/uri/Makefile.in
@@ -1,5 +1,9 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
top_builddir=@top_builddir@
-INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include -I$(srcdir)../include -I$(srcdir)../include/private
+top_srcdir=@abs_srcdir@
+INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include/private @APR_INCLUDES@
TARGETS = $(top_builddir)/include/private/uri_delims.h apr_uri.lo
CLEAN_TARGETS = gen_uri_delims $(top_builddir)/include/private/uri_delims.h