summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in1
-rw-r--r--config.layout1
-rw-r--r--configure.in4
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index c3c203bcf..bf1b55b72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,6 +70,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
installbuilddir=@installbuilddir@
LDADD_dbd_pgsql = @LDADD_dbd_pgsql@
diff --git a/config.layout b/config.layout
index 0f42e84e2..fb087a855 100644
--- a/config.layout
+++ b/config.layout
@@ -223,6 +223,7 @@
libexecdir: ${exec_prefix}/lib/apr/modules
mandir: ${exec_prefix}/share/man
datadir: ${exec_prefix}/share/apr
+ installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION}
localstatedir: ${prefix}/var/run
runtimedir: ${prefix}/var/run
diff --git a/configure.in b/configure.in
index 6f56b8f99..58bd7983c 100644
--- a/configure.in
+++ b/configure.in
@@ -286,8 +286,8 @@ AC_PROG_LIBTOOL
;;
esac
-AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
- [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
+AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files],
+ [ installbuilddir=$withval ] )
AC_SUBST(installbuilddir)
AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the library],