[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-175-gf5b88a4

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  f5b88a43eb5f24ea49aa4d6665044bd3d786fe28 (commit)
       via  42a8eb9824b793e156aa1253545984ccfd5fedbd (commit)
      from  cacdb08301e7066210f55bc28131ef95966b5e05 (commit)

Summary of changes:
 Makefile.in     |    2 +-
 config.layout   |    2 +-
 m4/rt_layout.m4 |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 42a8eb9824b793e156aa1253545984ccfd5fedbd
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Oct 19 23:54:39 2010 +0900

    readd another dist that shipwright gets cranky about

diff --git a/Makefile.in b/Makefile.in
index 4d9bfa1..a8265d4 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -528,6 +528,6 @@ vessel-import: build-snapshot
     --name RT \
 	--repository fs:$(VESSEL) \
      --log-level=info \
-     --skip cpan-capitalization,cpan-mod_perl,cpan-Encode,cpan-PPI,cpan-Test-Exception-LessClever,cpan-Test-Manifest,cpan-Test-NoWarnings,cpan-Test-Object,cpan-Test-Pod,cpan-Test-Requires,cpan-Test-SubCalls,cpan-Test-cpan-Tester,cpan-Test-Warn --skip-all-recommends
+     --skip cpan-capitalization,cpan-mod_perl,cpan-Encode,cpan-PPI,cpan-Test-Exception-LessClever,cpan-Test-Manifest,cpan-Test-Object,cpan-Test-Pod,cpan-Test-Requires,cpan-Test-SubCalls,cpan-Test-cpan-Tester,cpan-Test-Warn --skip-all-recommends
 	mv $(VESSEL)/scripts/RT/build  $(VESSEL)/scripts/RT/build.pl
 

commit f5b88a43eb5f24ea49aa4d6665044bd3d786fe28
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Oct 20 00:30:24 2010 +0900

    customplugindir cleanups to autoconf

diff --git a/config.layout b/config.layout
index 6d7adad..d951f1f 100755
--- a/config.layout
+++ b/config.layout
@@ -200,7 +200,7 @@
   customlibdir:		${customdir}/lib
   customplugindir:  ${customdir}/plugins
 </Layout>
-<Layout vessel-relative>
+<Layout vessel>
   prefix:		/opt/rt3
   exec_prefix:		${prefix}
   bindir:		bin
diff --git a/m4/rt_layout.m4 b/m4/rt_layout.m4
index bdc4b2c..e7535f9 100755
--- a/m4/rt_layout.m4
+++ b/m4/rt_layout.m4
@@ -40,7 +40,7 @@ AC_DEFUN([RT_LAYOUT],[
 				 sysconfdir mandir libdir datadir htmldir fontdir \
 				 localstatedir logfiledir masonstatedir plugindir \
 				 sessionstatedir customdir custometcdir customhtmldir \
-				 customlexdir customlibdir manualdir; do
+				 customplugindir customlexdir customlibdir manualdir; do
 				eval "val=\"\$$var\""
 				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
 				val=`echo $val | 
@@ -74,4 +74,5 @@ AC_DEFUN([RT_LAYOUT],[
 	RT_SUBST_EXPANDED_ARG(customhtmldir)
 	RT_SUBST_EXPANDED_ARG(customlexdir)
 	RT_SUBST_EXPANDED_ARG(customlibdir)
+	RT_SUBST_EXPANDED_ARG(customplugindir)
 ])dnl

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