masonstatedir can't be configured form ./configure either, must use layout

diff --git a/Makefile b/Makefile
index bce1d61..d71046f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@ configure-rt:
        cp config.layout.in config.layout; \
        perl -p -i -e "\
          s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
+         s'%%%MASONDATA%%%'${MASONDATA}'g;\
        " config.layout; \
        ./configure --with-layout=Freeside\
-                   --masonstatedir=${MASONDATA} \
                    --with-db-type=Pg \
                    --with-db-database=freeside \
                    --with-db-rt-user=${DB_USER} \

diff --git a/rt/config.layout.in b/rt/config.layout.in
index 63ed61b..a08f489 100644 (file)
--- a/rt/config.layout.in
+++ b/rt/config.layout.in
@@ -116,7 +116,7 @@
   manualdir:           ${datadir}/doc
   localstatedir:       ${prefix}/var
   logfiledir:          ${localstatedir}/log
-  masonstatedir:       ${localstatedir}/mason_data
+  masonstatedir:       %%%MASONDATA%%%
   sessionstatedir:     ${localstatedir}/session_data
   customdir:           ${prefix}/local
   custometcdir:                ${customdir}/etc