diff options
| author | Greg Stein <gstein@apache.org> | 2002-08-22 20:34:16 +0000 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2002-08-22 20:34:16 +0000 |
| commit | 37c37c8e3e5f39bb261549b23bcc8c5dde7351fc (patch) | |
| tree | 7bb7cd61fb962fe1367c61c15324241d6f4eb245 /config.layout | |
| parent | bbe97ad382a22dc549583fe3acf4a7e60897fa53 (diff) | |
| download | apr-37c37c8e3e5f39bb261549b23bcc8c5dde7351fc.tar.gz | |
* substitute APR_MAJOR_VERSION to the Makefile so that other
substitutions can refer to it (eg. APR_LIBNAME)
* add a param to APR_ENABLE_LAYOUT to specify the default ("apr" in
our case, not "Apache")
* change the default APR layout to support parallel installation;
rename the old layout to "classic"
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'config.layout')
| -rw-r--r-- | config.layout | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config.layout b/config.layout index 4e26e2227..e059302e6 100644 --- a/config.layout +++ b/config.layout @@ -9,7 +9,7 @@ ## (This may become a configurable parameter at some point.) ## -# Classical apr path layout. +# Classical APR path layout designed for parallel installs. <Layout apr> prefix: /usr/local/apr exec_prefix: ${prefix} @@ -21,25 +21,25 @@ sysconfdir: ${prefix}/conf datadir: ${prefix} installbuilddir: ${datadir}/build - includedir: ${prefix}/include + includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} localstatedir: ${prefix} + libsuffix: -${APR_MAJOR_VERSION} </Layout> -# Classical apr path layout designed for parallel installs. -<Layout parallel-apr> +# Classical single-installation APR path layout. +<Layout classic> prefix: /usr/local/apr exec_prefix: ${prefix} bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib/apr-${APR_MAJOR_VERSION} + libdir: ${exec_prefix}/lib libexecdir: ${exec_prefix}/modules mandir: ${prefix}/man sysconfdir: ${prefix}/conf datadir: ${prefix} installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} + includedir: ${prefix}/include localstatedir: ${prefix} - libsuffix: -${APR_MAJOR_VERSION} </Layout> # GNU standards conforming path layout. |