[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-170-gac8ab44

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  ac8ab44111cb6a9695642eaa339390823f051c02 (commit)
      from  f8e73310312f07ed02aa668f06184994dd59c9bf (commit)

Summary of changes:
 aclocal.m4             |    3 ++-
 config.layout          |   32 ++++++++++++++++++++++++++++++++
 configure.ac           |    3 +++
 lib/RT/Generated.pm.in |    2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit ac8ab44111cb6a9695642eaa339390823f051c02
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Oct 19 23:15:34 2010 +0900

    autoconfiscate the plugin dir

diff --git a/aclocal.m4 b/aclocal.m4
index a2686b9..d427e13 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -93,7 +93,7 @@ AC_DEFUN([RT_LAYOUT],[
 				 sysconfdir mandir libdir datadir htmldir fontdir\
 				 lexdir localstatedir logfiledir masonstatedir \
 				 sessionstatedir customdir custometcdir customhtmldir \
-				 customlexdir customlibdir manualdir; do
+				 customlexdir customplugindir customlibdir manualdir; do
 				eval "val=\"\$$var\""
 				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
 				val=`echo $val | 
@@ -125,6 +125,7 @@ AC_DEFUN([RT_LAYOUT],[
 	RT_SUBST_EXPANDED_ARG(sessionstatedir)
 	RT_SUBST_EXPANDED_ARG(customdir)
 	RT_SUBST_EXPANDED_ARG(custometcdir)
+	RT_SUBST_EXPANDED_ARG(customplugindir)
 	RT_SUBST_EXPANDED_ARG(customhtmldir)
 	RT_SUBST_EXPANDED_ARG(customlexdir)
 	RT_SUBST_EXPANDED_ARG(customlibdir)
diff --git a/config.layout b/config.layout
index dd6008f..2453a29 100755
--- a/config.layout
+++ b/config.layout
@@ -39,6 +39,7 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
 <Layout inplace>
   prefix:		.
@@ -63,6 +64,7 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
 
 <Layout FHS>
@@ -91,6 +93,7 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
 
 <Layout FreeBSD>
@@ -116,6 +119,7 @@
   customhtmldir:	${customdir}/local/html
   customlexdir:		${customdir}/local/po
   customlibdir:		${customdir}/local/lib
+  customplugindir:  ${customdir}/local/plugins
 </Layout>
 
 <Layout Win32>
@@ -141,6 +145,7 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
 
 #   RH path layout.
@@ -167,6 +172,7 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
 
 <Layout relative>
@@ -192,4 +198,30 @@
   customhtmldir:	${customdir}/html
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
+</Layout>
+<Layout vessel-relative>
+  prefix:		/opt/rt3
+  exec_prefix:		${prefix}
+  bindir:		bin
+  sbindir:		sbin
+  sysconfdir:	etc/rt/
+  mandir:		man
+  plugindir:	${datadir}/plugins
+  libdir:		lib/rt/perl5/
+  datadir:		share/rt/
+  htmldir:		${datadir}/html
+  fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
+  manualdir:	${datadir}/doc
+  localstatedir:	var/rt/
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		local/rt/
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+  customplugindir:  ${customdir}/plugins
 </Layout>
diff --git a/configure.ac b/configure.ac
index 3981d16..dcc023d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,7 @@ AC_SUBST([LOCAL_ETC_PATH],		${exp_custometcdir})
 AC_SUBST([MASON_LOCAL_HTML_PATH],	${exp_customhtmldir})
 AC_SUBST([LOCAL_LEXICON_PATH],		${exp_customlexdir})
 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
@@ -362,6 +363,7 @@ AC_SUBST([LOCAL_ETC_PATH_R],		${exp_prefix}/${exp_custometcdir})
 AC_SUBST([MASON_LOCAL_HTML_PATH_R],	${exp_prefix}/${exp_customhtmldir})
 AC_SUBST([LOCAL_LEXICON_PATH_R],		${exp_prefix}/${exp_customlexdir})
 AC_SUBST([LOCAL_LIB_PATH_R],		${exp_prefix}/${exp_customlibdir})
+AC_SUBST([LOCAL_PLUGIN_PATH_R],		${exp_prefix}/${exp_customplugindir})
 AC_SUBST([RT_LOG_PATH_R],			${exp_prefix}/${exp_logfiledir})
 else
 AC_SUBST([RT_PATH_R],			${exp_prefix})
@@ -383,6 +385,7 @@ AC_SUBST([MASON_HTML_PATH_R],		${exp_htmldir})
 AC_SUBST([LOCAL_ETC_PATH_R],		${exp_custometcdir})
 AC_SUBST([MASON_LOCAL_HTML_PATH_R],	${exp_customhtmldir})
 AC_SUBST([LOCAL_LEXICON_PATH_R],		${exp_customlexdir})
+AC_SUBST([LOCAL_PLUGIN_PATH_R],		${exp_customplugindir})
 AC_SUBST([LOCAL_LIB_PATH_R],		${exp_customlibdir})
 AC_SUBST([RT_LOG_PATH_R],			${exp_logfiledir})
 
diff --git a/lib/RT/Generated.pm.in b/lib/RT/Generated.pm.in
index 809fc3e..b4251f2 100644
--- a/lib/RT/Generated.pm.in
+++ b/lib/RT/Generated.pm.in
@@ -17,7 +17,7 @@ $LocalPath = '@RT_LOCAL_PATH@';
 $LocalEtcPath = '@LOCAL_ETC_PATH@';
 $LocalLibPath        =    '@LOCAL_LIB_PATH@';
 $LocalLexiconPath = '@LOCAL_LEXICON_PATH@';
-$LocalPluginPath = $LocalPath."/plugins";
+$LocalPluginPath = '@LOCAL_PLUGIN_PATH@';
 # $MasonComponentRoot is where your rt instance keeps its mason html files
 $MasonComponentRoot = '@MASON_HTML_PATH@';
 # $MasonLocalComponentRoot is where your rt instance keeps its site-local

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