- Add parallel-apr layout which confines the 'parallel install' logic to a

  layout rather than unchangeable values.
- Delay layout parsing until after we have setup the directory variables and
  determined our APR version.
- Use ${libsuffix} instead of hardcoded -${APR_MAJOR_VERSION}.
- Parse libsuffix in config.layout.
- Add version info to rules.mk
- Add APR_MAJOR_VERSION to apr-config.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63816 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 0 deletions

diff --git a/config.layout b/config.layout
index 245da94eb..4e26e2227 100644
--- a/config.layout
+++ b/config.layout
@@ -25,6 +25,23 @@
     localstatedir: ${prefix}
 </Layout>
 
+#   Classical apr path layout designed for parallel installs.
+<Layout parallel-apr>
+    prefix:        /usr/local/apr
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib/apr-${APR_MAJOR_VERSION}
+    libexecdir:    ${exec_prefix}/modules
+    mandir:        ${prefix}/man
+    sysconfdir:    ${prefix}/conf
+    datadir:       ${prefix}
+    installbuilddir: ${datadir}/build
+    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
+    localstatedir: ${prefix}
+    libsuffix:     -${APR_MAJOR_VERSION}
+</Layout>
+
 #   GNU standards conforming path layout.
 #   See FSF's GNU project `make-stds' document for details.
 <Layout GNU>