[Rt-commit] r11938 - rt/branches/3.8-TESTING

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Apr 28 21:51:15 2008
New Revision: 11938

Modified:
   rt/branches/3.8-TESTING/Makefile.in
   rt/branches/3.8-TESTING/config.layout
   rt/branches/3.8-TESTING/configure.ac

Log:
added relative layout. in .in files @PATH@ with '_R' mean they're revised, which are always absolute, while ones without '_R' can be relative

Modified: rt/branches/3.8-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.8-TESTING/Makefile.in	(original)
+++ rt/branches/3.8-TESTING/Makefile.in	Mon Apr 28 21:51:15 2008
@@ -53,7 +53,7 @@
 
 PERL			= 	@PERL@
 
-CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH@
+CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH_R@
 CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
 SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
@@ -93,24 +93,24 @@
 DESTDIR			=	
 
 
-RT_PATH			=	@RT_PATH@
-RT_ETC_PATH		=	@RT_ETC_PATH@
-RT_BIN_PATH		=	@RT_BIN_PATH@
-RT_SBIN_PATH		=	@RT_SBIN_PATH@
-RT_LIB_PATH		=	@RT_LIB_PATH@
-RT_MAN_PATH		=	@RT_MAN_PATH@
-RT_VAR_PATH		=	@RT_VAR_PATH@
-RT_DOC_PATH		=	@RT_DOC_PATH@
-RT_LOCAL_PATH		=	@RT_LOCAL_PATH@
-RT_LOCAL_PLUGIN_PATH		=	@RT_LOCAL_PATH@/plugins
-LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH@
-LOCAL_LIB_PATH		=	@LOCAL_LIB_PATH@
-LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH@
-MASON_HTML_PATH		=	@MASON_HTML_PATH@
-MASON_LOCAL_HTML_PATH	=	@MASON_LOCAL_HTML_PATH@
-MASON_DATA_PATH		=	@MASON_DATA_PATH@
-MASON_SESSION_PATH	=	@MASON_SESSION_PATH@
-RT_LOG_PATH	    =       @RT_LOG_PATH@
+RT_PATH			=	@RT_PATH_R@
+RT_ETC_PATH		=	@RT_ETC_PATH_R@
+RT_BIN_PATH		=	@RT_BIN_PATH_R@
+RT_SBIN_PATH		=	@RT_SBIN_PATH_R@
+RT_LIB_PATH		=	@RT_LIB_PATH_R@
+RT_MAN_PATH		=	@RT_MAN_PATH_R@
+RT_VAR_PATH		=	@RT_VAR_PATH_R@
+RT_DOC_PATH		=	@RT_DOC_PATH_R@
+RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
+RT_LOCAL_PLUGIN_PATH		=	@RT_LOCAL_PATH_R@/plugins
+LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
+LOCAL_LIB_PATH		=	@LOCAL_LIB_PATH_R@
+LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH_R@
+MASON_HTML_PATH		=	@MASON_HTML_PATH_R@
+MASON_LOCAL_HTML_PATH	=	@MASON_LOCAL_HTML_PATH_R@
+MASON_DATA_PATH		=	@MASON_DATA_PATH_R@
+MASON_SESSION_PATH	=	@MASON_SESSION_PATH_R@
+RT_LOG_PATH	    =       @RT_LOG_PATH_R@
 
 # RT_READABLE_DIR_MODE is the mode of directories that are generally meant
 # to be accessable

Modified: rt/branches/3.8-TESTING/config.layout
==============================================================================
--- rt/branches/3.8-TESTING/config.layout	(original)
+++ rt/branches/3.8-TESTING/config.layout	Mon Apr 28 21:51:15 2008
@@ -150,3 +150,23 @@
   customlexdir:		${customdir}/po
   customlibdir:		${customdir}/lib
 </Layout>
+
+<Layout relative>
+  bindir:		bin
+  sbindir:		sbin
+  sysconfdir:	etc
+  mandir:		man
+  libdir:		lib
+  datadir:		share
+  htmldir:		${datadir}/html
+  manualdir:	${datadir}/doc
+  localstatedir:	var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>

Modified: rt/branches/3.8-TESTING/configure.ac
==============================================================================
--- rt/branches/3.8-TESTING/configure.ac	(original)
+++ rt/branches/3.8-TESTING/configure.ac	Mon Apr 28 21:51:15 2008
@@ -323,6 +323,49 @@
 AC_SUBST([DESTDIR],			${exp_prefix})
 AC_SUBST([RT_LOG_PATH],			${exp_logfiledir})
 
+if test ${exp_sysconfdir} = "etc"; 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})
+AC_SUBST([RT_LIB_PATH_R],			${exp_prefix}/${exp_libdir})
+AC_SUBST([RT_ETC_PATH_R],			${exp_prefix}/${exp_sysconfdir})
+AC_SUBST([CONFIG_FILE_PATH_R],		${exp_prefix}/${exp_sysconfdir})
+AC_SUBST([RT_BIN_PATH_R],			${exp_prefix}/${exp_bindir})
+AC_SUBST([RT_SBIN_PATH_R],		${exp_prefix}/${exp_sbindir})
+AC_SUBST([RT_VAR_PATH_R],			${exp_prefix}/${exp_localstatedir})
+AC_SUBST([RT_MAN_PATH_R],			${exp_prefix}/${exp_mandir})
+AC_SUBST([MASON_DATA_PATH_R],		${exp_prefix}/${exp_masonstatedir})
+AC_SUBST([MASON_SESSION_PATH_R],		${exp_prefix}/${exp_sessionstatedir})
+AC_SUBST([MASON_HTML_PATH_R],		${exp_prefix}/${exp_htmldir})
+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([DESTDIR_R],			${exp_prefix})
+AC_SUBST([RT_LOG_PATH_R],			${exp_prefix}/${exp_logfiledir})
+else
+AC_SUBST([RT_PATH_R],			${exp_prefix})
+AC_SUBST([RT_DOC_PATH_R],			${exp_manualdir})
+AC_SUBST([RT_LOCAL_PATH_R],		${exp_customdir})
+AC_SUBST([RT_LIB_PATH_R],			${exp_libdir})
+AC_SUBST([RT_ETC_PATH_R],			${exp_sysconfdir})
+AC_SUBST([CONFIG_FILE_PATH_R],		${exp_sysconfdir})
+AC_SUBST([RT_BIN_PATH_R],			${exp_bindir})
+AC_SUBST([RT_SBIN_PATH_R],		${exp_sbindir})
+AC_SUBST([RT_VAR_PATH_R],			${exp_localstatedir})
+AC_SUBST([RT_MAN_PATH_R],			${exp_mandir})
+AC_SUBST([MASON_DATA_PATH_R],		${exp_masonstatedir})
+AC_SUBST([MASON_SESSION_PATH_R],		${exp_sessionstatedir})
+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_LIB_PATH_R],		${exp_customlibdir})
+AC_SUBST([DESTDIR_R],			${exp_prefix})
+AC_SUBST([RT_LOG_PATH_R],			${exp_logfiledir})
+
+fi
+
 dnl Configure the output files, and generate them.
 
 dnl Binaries that should be +x