diff options
| author | ivan <ivan> | 2009-12-31 13:16:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-12-31 13:16:41 +0000 |
| commit | b4b0c7e72d7eaee2fbfc7022022c9698323203dd (patch) | |
| tree | ba4cd21399e412c32fe3737eaa8478e3271509f9 /rt/m4/rt_layout.m4 | |
| parent | 2dfda73eeb3eae2d4f894099754794ef07d060dd (diff) | |
import rt 3.8.7
Diffstat (limited to 'rt/m4/rt_layout.m4')
| -rw-r--r-- | rt/m4/rt_layout.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4 index c92a108ca..fbb289074 100644 --- a/rt/m4/rt_layout.m4 +++ b/rt/m4/rt_layout.m4 @@ -27,7 +27,7 @@ AC_DEFUN([RT_LAYOUT],[ s/\s+$/\n/gim; s/\+$/\/rt3/gim; # m4 will not let us just use $1, we need @S|@1 -# s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@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 @@ -38,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\"" @@ -63,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) |