Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (5a73ae599a6d07bb308f68f4091e281fb3826a4b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (5a73ae599a6d07bb308f68f4091e281fb3826a4b)
  • Date: Sat, 17 Feb 2007 11:14:38 -0600

GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

http/apache2/HISTORY | 5 +++++
http/apache2/config.layout | 40 ++++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 5a73ae599a6d07bb308f68f4091e281fb3826a4b
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

apache2: use absolute paths in config.layout (bug 13510)
(cherry picked from commit a731f728a96de4fead3264dfd7427e1ca08a38c4)

diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 2d158f9..600fcaf 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,8 @@
+2007-02-17 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * config.layout: Use literal paths everywhere because otherwise
+ autoconf 2.60 gets lost when apxs is invoked. Bug 13510. Remove
+ $INSTALL_ROOT for the same reason.
+
2007-02-06 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DETAILS: PATCHLEVEL++
* config.layout: Some more tweaks for bugs 13295 and 13051.
diff --git a/http/apache2/config.layout b/http/apache2/config.layout
index 05fe8b9..547cee0 100644
--- a/http/apache2/config.layout
+++ b/http/apache2/config.layout
@@ -11,25 +11,25 @@

# 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: ${INSTALL_ROOT}/etc/httpd
- datadir: ${prefix}/share+
- 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}/cache/apache2/proxy
+ prefix: /usr
+ exec_prefix: /usr
+ bindir: /usr/bin
+ sbindir: /usr/sbin
+ libdir: /usr/lib
+ libexecdir: /usr/libexec
+ mandir: /usr/share/man
+ sysconfdir: /etc/httpd
+ datadir: /usr/share/apache2
+ installbuilddir: /usr/share/apache2/build
+ errordir: /usr/share/apache2/error
+ iconsdir: /usr/share/apache2/icons
+ htdocsdir: /usr/share/apache2/htdocs
+ manualdir: /usr/share/apache2/manual
+ cgidir: /usr/share/apache2/cgi-bin
+ includedir: /usr/include/apache2
+ localstatedir: /var
+ runtimedir: /var/run
+ logfiledir: /var/log
+ proxycachedir: /var/cache/apache2/proxy
</Layout>




  • [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (5a73ae599a6d07bb308f68f4091e281fb3826a4b), Jaka Kranjc, 02/17/2007

Archive powered by MHonArc 2.6.24.

Top of Page