1 Patch origin: in-house

     2 Patch status: Solaris-specific; not suitable for upstream

     3 

     4 --- config.layout

     5 +++ config.layout

     6 @@ -202,26 +202,26 @@

     7      proxycachedir: ${localstatedir}/proxy

     8  </Layout>

     9  

    10 -#   Solaris 8 Layout

    11 +#   Solaris Layout

    12  <Layout Solaris>

    13 -    prefix:        /usr/apache

    14 +    prefix:        /usr/apache2/2.4

    15      exec_prefix:   ${prefix}

    16      bindir:        ${exec_prefix}/bin

    17      sbindir:       ${exec_prefix}/bin

    18      libdir:        ${exec_prefix}/lib

    19      libexecdir:    ${exec_prefix}/libexec

    20      mandir:        ${exec_prefix}/man

    21 -    sysconfdir:    /etc/apache

    22 -    datadir:       /var/apache

    23 -    installbuilddir: ${datadir}/build

    24 +    sysconfdir:    /etc/apache2/2.4

    25 +    datadir:       /var/apache2/2.4

    26 +    installbuilddir: ${prefix}/build

    27      errordir:      ${datadir}/error

    28      iconsdir:      ${datadir}/icons

    29      htdocsdir:     ${datadir}/htdocs

    30 -    manualdir:     ${datadir}/manual

    31 +    manualdir:     ${prefix}/manual

    32      cgidir:        ${datadir}/cgi-bin

    33      includedir:    ${exec_prefix}/include

    34      localstatedir: ${prefix}

    35 -    runtimedir:    /var/run

    36 +    runtimedir:    /var/run/apache2/2.4

    37      logfiledir:    ${datadir}/logs

    38      proxycachedir: ${datadir}/proxy

    39  </Layout>