[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-238-g31ebb1e

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  31ebb1ed4cb114a684da537f69575e024dde1d1c (commit)
       via  40028576afe6beefc0b57e001168571b81cbf8e2 (commit)
      from  f614d53ea8069bb88a3e8e7a0b3c2d617982b784 (commit)

Summary of changes:
 config.layout |    6 +++---
 configure.ac  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 40028576afe6beefc0b57e001168571b81cbf8e2
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Oct 20 01:01:33 2010 +0900

    make autoconf's relativization support our vessel layout

diff --git a/configure.ac b/configure.ac
index 67cea10..6b5eb0f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,7 @@ AC_SUBST([LOCAL_LIB_PATH],		${exp_customlibdir})
 AC_SUBST([LOCAL_PLUGIN_PATH],		${exp_customplugindir})
 AC_SUBST([RT_LOG_PATH],			${exp_logfiledir})
 
-if test ${exp_sysconfdir} = "etc"; then
+if test ${exp_sysconfdir} = "etc" -o ${exp_sysconfdir} = "etc/rt"; then
 AC_SUBST([RT_PATH_R],			${exp_prefix})
 AC_SUBST([RT_DOC_PATH_R],			${exp_prefix}/${exp_manualdir})
 AC_SUBST([RT_LOCAL_PATH_R],		${exp_prefix}/${exp_customdir})

commit 31ebb1ed4cb114a684da537f69575e024dde1d1c
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Oct 20 09:09:42 2010 +0900

    another try at a vessel layout

diff --git a/config.layout b/config.layout
index d951f1f..3da8e07 100755
--- a/config.layout
+++ b/config.layout
@@ -207,8 +207,8 @@
   sbindir:		sbin
   sysconfdir:	etc/rt/
   mandir:		man
-  libdir:		rt/lib/
-  datadir:		rt/share/
+  libdir:		lib/rt
+  datadir:		share/rt
   plugindir:	${datadir}/plugins
   htmldir:		${datadir}/html
   fontdir:		${datadir}/fonts
@@ -218,7 +218,7 @@
   logfiledir:		${localstatedir}/log
   masonstatedir:	${localstatedir}/mason_data
   sessionstatedir:	${localstatedir}/session_data
-  customdir:		rt/local
+  customdir:		local/rt/
   custometcdir:		${customdir}/etc
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po

-----------------------------------------------------------------------