]> granicus.if.org Git - apache/blobdiff - config.layout
replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.
[apache] / config.layout
index 5d7109547aa2663c9d3d05c8a0566ade0a936256..af28f9f08f0ca1293b7b9af27988baf9fe3c8a9a 100644 (file)
@@ -2,11 +2,11 @@
 ##  config.layout -- Pre-defined Installation Path Layouts
 ##
 ##  Hints:
-##  - layouts can be loaded with configure's --with-layout=ID option
-##  - when no --with-layout option is given, the default layout is `Apache'
+##  - layouts can be loaded with configure's --enable-layout=ID option
+##  - when no --enable-layout option is given, the default layout is `Apache'
 ##  - a trailing plus character (`+') on paths is replaced with a 
-##    `/<target>' suffix where <target> is the the argument from 
-##    option --target (defaults to `httpd').
+##    `/<target>' suffix where <target> is currently hardcoded to 'apache2'.
+##    (This may become a configurable parameter at some point.)
 ##
 
 #   Classical Apache path layout.
@@ -15,6 +15,7 @@
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/modules
     mandir:        ${prefix}/man
     sysconfdir:    ${prefix}/conf
@@ -39,6 +40,7 @@
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec
     mandir:        ${prefix}/man
     sysconfdir:    ${prefix}/etc+
     proxycachedir: ${localstatedir}/proxy
 </Layout>
 
-#   Apache binary distribution path layout
-<Layout BinaryDistribution>
-    prefix:        /usr/local/apache
-    exec_prefix:
-    bindir:        bin
-    sbindir:       bin
-    libexecdir:    libexec
-    mandir:        man
-    sysconfdir:    conf
-    datadir:
-    installbuilddir: build
-    errordir:      error
-    iconsdir:      icons
-    htdocsdir:     htdocs
-    manualdir:     manual
-    cgidir:        cgi-bin
-    includedir:    include
-    localstatedir:
-    runtimedir:    logs
-    logfiledir:    logs
-    proxycachedir: proxy
-</Layout>
-
 #   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer
     exec_prefix:   /usr
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    /System/Library/Apache/Modules
     mandir:        ${exec_prefix}/share/man
     sysconfdir:    ${prefix}/Configuration
@@ -95,7 +75,7 @@
     manualdir:     /System/Library/Apache/Manual
     htdocsdir:     ${datadir}/Documents
     cgidir:        ${datadir}/CGI-Executables
-    includedir:    /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers
+    includedir:    /System/Library/Frameworks/Apache.framework/Versions/2.0/Headers
     localstatedir: /var
     runtimedir:    ${prefix}/Logs
     logfiledir:    ${prefix}/Logs
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec+
     mandir:        ${prefix}/share/man
     datadir:       /Library/WebServer
     proxycachedir: ${runtimedir}/proxy
 </Layout>
 
-#   RedHat 5.x layout
+#   Red Hat Linux 7.x layout
 <Layout RedHat>
     prefix:        /usr
     exec_prefix:   ${prefix}
     bindir:        ${prefix}/bin
     sbindir:       ${prefix}/sbin
+    libdir:        ${prefix}/lib
     libexecdir:    ${prefix}/lib/apache
     mandir:        ${prefix}/man
     sysconfdir:    /etc/httpd/conf
-    datadir:       /home/httpd
+    datadir:       /var/www
     installbuilddir: ${datadir}/build
     errordir:      ${datadir}/error
     iconsdir:      ${datadir}/icons
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec
     mandir:        ${prefix}/man
     sysconfdir:    /etc${prefix}
     proxycachedir: ${localstatedir}/proxy
 </Layout>
 
-#  BeOS layout...
-<Layout beos>
-    prefix:        /boot/home/apache
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    ${localstatedir}/logs
-    logfiledir:    ${localstatedir}/logs
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
 #   SuSE 6.x layout
 <Layout SuSE>
     prefix:        /usr
     exec_prefix:   ${prefix}
     bindir:        ${prefix}/bin
     sbindir:       ${prefix}/sbin
+    libdir:        ${prefix}/lib
     libexecdir:    ${prefix}/lib/apache
-    mandir:        ${prefix}/man
+    mandir:        ${prefix}/share/man
     sysconfdir:    /etc/httpd
     datadir:       /usr/local/httpd
     installbuilddir: ${datadir}/build
     manualdir:     ${datadir}/manual
     cgidir:        ${datadir}/cgi-bin
     includedir:    ${prefix}/include/apache
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/log/httpd
-    proxycachedir: ${localstatedir}/cache/httpd
+    localstatedir: /var/lib/httpd
+    runtimedir:    /var/run
+    logfiledir:    /var/log/httpd
+    proxycachedir: /var/cache/httpd
 </Layout>
 
 #   BSD/OS layout
     exec_prefix:   /usr/contrib
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec/apache
     mandir:        ${exec_prefix}/man
     sysconfdir:    ${prefix}/conf
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec
     mandir:        ${exec_prefix}/man
     sysconfdir:    /etc/apache
     exec_prefix:   /usr
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/lib/apache/modules
     mandir:        ${exec_prefix}/share/man
     sysconfdir:    ${prefix}/conf
     proxycachedir: ${prefix}/proxy
 </Layout>
 
+# FreeBSD Layout
+<Layout FreeBSD>
+  prefix:        /usr/local
+  exec_prefix:   ${prefix}
+  bindir:        ${exec_prefix}/bin
+  sbindir:       ${exec_prefix}/sbin
+  libdir:        ${exec_prefix}/lib
+  libexecdir:    ${exec_prefix}/libexec/apache2
+  mandir:        ${prefix}/man
+  sysconfdir:    ${prefix}/etc/apache2
+  datadir:       ${prefix}/www
+  installbuilddir: ${prefix}/share/apache2/build
+  errordir:      ${datadir}/error
+  iconsdir:      ${datadir}/icons
+  htdocsdir:     ${datadir}/data
+  manualdir:     ${prefix}/share/doc/apache2
+  cgidir:        ${datadir}/cgi-bin
+  includedir:    ${prefix}/include/apache2
+  localstatedir: /var
+  runtimedir:    ${localstatedir}/run
+  logfiledir:    ${localstatedir}/log
+  proxycachedir: ${datadir}/proxy
+</Layout>
+
 # Debian layout
 <Layout Debian>
     prefix:        
     exec_prefix:   ${prefix}/usr
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/lib/apache2/modules
     mandir:        ${exec_prefix}/share/man
     sysconfdir:    ${prefix}/etc/apache2
     datadir:       ${exec_prefix}/share/apache2
     iconsdir:      ${datadir}/icons
     htdocsdir:     ${prefix}/usr/share/apache2/default-site/htdocs
+    manualdir:     ${htdocsdir}/manual
     cgidir:        ${prefix}/usr/lib/cgi-bin
     includedir:    ${exec_prefix}/include/apache2
-    localstatedir: ${prefix}/var/run
-    runtimedir:    ${prefix}/var/run
+    localstatedir: ${prefix}/var/lock/apache2
+    runtimedir:    ${prefix}/var/run/apache2
     logfiledir:    ${prefix}/var/log/apache2
     proxycachedir: ${prefix}/var/cache/apache2/proxy
     infodir:       ${exec_prefix}/share/info
-    installbuilddir: ${prefix}/etc/apache2/build
+    installbuilddir: ${prefix}/usr/share/apache2/build
+    errordir:      ${datadir}/error
 </Layout>