Add FreeBSD directory layout

PR: 21100
Submitted by:   info@orangexl.com (Sander Holthaus)
Reviewed by:    Brian Pane, Erik Abele, Astrid Ke�ler

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100560 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b6f3f342ef28745867f3a4c46476a34ae929b669..5be9c2636fcb6362d8023a401db7736d26da0b0d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.48
 
+  *) Added FreeBSD directory layout. PR 21100.
+     [Sander Holthaus <info@orangexl.com>, André Malo]
+
   *) Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
      response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
 

diff --git a/STATUS b/STATUS
index 8ec9abc7fb4b1d4f324b0fa303d1ac6accef560e..ca37749f8329ba16e053087f45cb3d470e3f61d2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/07/12 12:44:10 $]
+Last modified at [$Date: 2003/07/12 12:56:17 $]
 
 Release:
 
@@ -232,10 +232,6 @@ PATCHES TO PORT FROM 2.1
         SIGSEGV to the current cgid daemon process and see what
         happens.
 
-    * Backport FreeBSD layout. PR 21100.
-        config.layout: r1.22
-      +1: nd, brianp, erikabele, kess
-
     * ab: catch out of memory (reasoning report ID 29)
         support/ab.c: r1.125
       +1: nd, erikabele

diff --git a/config.layout b/config.layout
index b4a317d3d7cb38c6c45320a3c02c2b1b231dee49..03cb8f5930ae2f2bd35d9955b3412bdde093f396 100644 (file)
--- a/config.layout
+++ b/config.layout
@@ -274,6 +274,30 @@
     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: