fix user modification?

[freeside.git] / rt / m4 / rt_layout.m4

diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4
index 393b321..fbb2890 100644 (file)
--- a/rt/m4/rt_layout.m4
+++ b/rt/m4/rt_layout.m4
@@ -21,14 +21,15 @@ AC_DEFUN([RT_LAYOUT],[
                pldconf=./config.pld
                $PERL  -0777 -p -e "\$layout = '$2';"  -e '
                s/.*<Layout\s+$layout>//gims; 
-               s/\<\/Layout\>.*//s; 
-               s/^#.*$//m;
+               s/<\/Layout>.*//s; 
+               s/^#.*$//gm;
                s/^\s+//gim;
                s/\s+$/\n/gim;
                s/\+$/\/rt3/gim;
                # m4 will not let us just use $1, we need @S|@1
-               s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
-               s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+#              s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|plugin|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+               # uh, should be [:=], but m4 apparently substitutes something...
+               s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
                 ' < $1 > $pldconf
 
                if test -s $pldconf; then
@@ -37,7 +38,7 @@ AC_DEFUN([RT_LAYOUT],[
                        changequote({,})
                        for var in prefix exec_prefix bindir sbindir \
                                 sysconfdir mandir libdir datadir htmldir \
-                                localstatedir logfiledir masonstatedir \
+                                localstatedir logfiledir masonstatedir plugindir \
                                 sessionstatedir customdir custometcdir customhtmldir \
                                 customlexdir customlibdir manualdir; do
                                eval "val=\"\$$var\""
@@ -62,6 +63,7 @@ AC_DEFUN([RT_LAYOUT],[
        RT_SUBST_EXPANDED_ARG(datadir)
        RT_SUBST_EXPANDED_ARG(htmldir)
        RT_SUBST_EXPANDED_ARG(manualdir)
+       RT_SUBST_EXPANDED_ARG(plugindir)
        RT_SUBST_EXPANDED_ARG(localstatedir)
        RT_SUBST_EXPANDED_ARG(logfiledir)
        RT_SUBST_EXPANDED_ARG(masonstatedir)