Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (217dd1d1d88237582c5bde91c6e11eb508726b03)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (217dd1d1d88237582c5bde91c6e11eb508726b03)
  • Date: Sat, 21 Oct 2006 13:00:35 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

http/apache2/BUILD | 5 ++++-
http/apache2/HISTORY | 4 ++++
http/apache2/config.layout | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 217dd1d1d88237582c5bde91c6e11eb508726b03
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

apache2: Added config.layout from apache22. Bug #13051.

diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index cc52a35..93d01a6 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -1,6 +1,9 @@
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&

+# use smgl standard layout
+cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
+
./buildconf --with-apr=/usr/share/apache2 \
--with-apr-util=/usr/share/apache2 &&

@@ -8,7 +11,7 @@ rm -fr srclib/apr*/ &&
--sysconfdir=$INSTALL_ROOT/etc/httpd \
--localstatedir=$INSTALL_ROOT/var \
--mandir=$INSTALL_ROOT/usr/share/man \
- --enable-layout=GNU \
+ --enable-layout=SMGL \
--enable-modules=most \
$OPTS &&
make
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index cdecb89..26b7514 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2006-10-21 George Sherwood <george AT beernabeer.com>
+ * BUILD: cp config.layout file. Use SMGL layout. Bug #13051.
+ * config.layout: added file for SMGL layout
+
2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
* CONFLICTS: added apache22 to the list

diff --git a/http/apache2/config.layout b/http/apache2/config.layout
new file mode 100644
index 0000000..5621559
--- /dev/null
+++ b/http/apache2/config.layout
@@ -0,0 +1,35 @@
+##
+## config.layout -- Pre-defined Installation Path Layouts
+##
+## Hints:
+## - 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 currently hardcoded to 'apache2'.
+## (This may become a configurable parameter at some point.)
+##
+
+# Source Mage standard path layout.
+<Layout SMGL>
+ prefix: ${INSTALL_ROOT}/usr
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/libexec
+ mandir: ${prefix}/share/man
+ sysconfdir: ${prefix}/etc+
+ datadir: ${INSTALL_ROOT}/var/www+
+ installbuilddir: ${datadir}/build
+ errordir: ${datadir}/error
+ iconsdir: ${datadir}/icons
+ htdocsdir: ${datadir}/htdocs
+ manualdir: ${datadir}/manual
+ cgidir: ${datadir}/cgi-bin
+ includedir: ${prefix}/include+
+ localstatedir: ${INSTALL_ROOT}/var
+ runtimedir: ${localstatedir}/run
+ logfiledir: ${localstatedir}/log+
+ proxycachedir: ${localstatedir}/proxy
+</Layout>
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (217dd1d1d88237582c5bde91c6e11eb508726b03), George Sherwood, 10/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page