Update the Redhat layout to match v7. I decided to just replace the old layout

on the principal that tracking every version of every os in config.layout would
be a nightmare.

PR: BZ-7422
Submitted by: Joe Orton

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

diff --git a/config.layout b/config.layout
index b7f52109fc840ae7dee41c11f997a2be6e383a52..06e600d40b4d2f367760dd2d87c8a33d990924df 100644 (file)
--- a/config.layout
+++ b/config.layout
@@ -115,7 +115,7 @@
     proxycachedir: $runtimedir/proxy
 </Layout>
 
-#   RedHat 5.x layout
+#   RedHat 7.x layout
 <Layout RedHat>
     prefix:        /usr
     exec_prefix:   $prefix
@@ -124,10 +124,10 @@
     libexecdir:    $prefix/lib/apache
     mandir:        $prefix/man
     sysconfdir:    /etc/httpd/conf
-    datadir:       /home/httpd
+    datadir:       /var/www
     iconsdir:      $datadir/icons
     htdocsdir:     $datadir/html
-    manualdir:     $htdocsdir/manual
+    manualdir:     $datadir/manual
     cgidir:        $datadir/cgi-bin
     includedir:    $prefix/include/apache
     localstatedir: /var

diff --git a/src/CHANGES b/src/CHANGES
index 6269ac134b10a9a8c2475f25af5081507db33c39..47d5115f99351e1a9657956b08bb6af749eb998d 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.25
 
+  *) Update the Redhat Layout to match Redhat version 7. PR BZ-7422
+     [Joe Orton] 
+
   *) Add some popular types to the mime magic file.  PR 7730.
      [Linus Walleij <triad@df.lth.se>, Justin Erenkrantz]