X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fm4%2Frt_layout.m4;h=bdc4b2cf522af74cb6b03441411dd37714110e6e;hb=10cddd917072b9d148b30c7561db34b0133695f4;hp=c92a108ca30571e6500f99adc4f00e02f6c619ab;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4 index c92a108ca..bdc4b2cf5 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 @@ -37,8 +37,8 @@ AC_DEFUN([RT_LAYOUT],[ . $pldconf changequote({,}) for var in prefix exec_prefix bindir sbindir \ - sysconfdir mandir libdir datadir htmldir \ - localstatedir logfiledir masonstatedir \ + sysconfdir mandir libdir datadir htmldir fontdir \ + localstatedir logfiledir masonstatedir plugindir \ sessionstatedir customdir custometcdir customhtmldir \ customlexdir customlibdir manualdir; do eval "val=\"\$$var\"" @@ -62,7 +62,9 @@ AC_DEFUN([RT_LAYOUT],[ RT_SUBST_EXPANDED_ARG(libdir) RT_SUBST_EXPANDED_ARG(datadir) RT_SUBST_EXPANDED_ARG(htmldir) + RT_SUBST_EXPANDED_ARG(fontdir) 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)