config.layout needs to be generated

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index e41fc2f..cab7db3 100644 (file)
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -1 +1,3 @@
 sbin/rt-setup-database
 sbin/rt-setup-database

+config.layout
+config.layout.in

diff --git a/rt/config.layout b/rt/config.layout
deleted file mode 100644 (file)
index 23a7775..0000000
--- a/rt/config.layout
+++ /dev/null
@@ -1,104 +0,0 @@
-##
-##  config.layout -- Pre-defined Installation Path Layouts
-##
-##  Hints:
-##  - layouts can be loaded with configure's --enable-layout=ID option
-##  - when no --enable-layout option is given, the default layout is `RT'
-##  - a trailing plus character (`+') on paths is replaced with a
-##    `/<target>' suffix where <target> is currently hardcoded to 'rt3'.
-##    (This may become a configurable parameter at some point.)
-##
-##  The following variables must _all_ be set:
-##     prefix exec_prefix bindir sbindir sysconfdir mandir libdir
-##     datadir htmldir localstatedir logfiledir masonstatedir
-##     sessionstatedir customdir customhtmldir customlexdir
-##  (This can be seen in m4/rt_layout.m4.)
-##
-
-#   Default RT3 path layout.
-<Layout RT3>
-  prefix:              /opt/rt3
-  exec_prefix:         ${prefix}
-  bindir:              ${exec_prefix}/bin
-  sbindir:             ${exec_prefix}/sbin
-  sysconfdir:          ${prefix}/etc
-  mandir:              ${prefix}/man
-  libdir:              ${prefix}/lib
-  datadir:             ${prefix}/share
-  htmldir:             ${datadir}/html
-  manualdir:           ${datadir}/doc
-  localstatedir:       ${prefix}/var
-  logfiledir:          ${localstatedir}/log
-  masonstatedir:       ${localstatedir}/mason_data
-  sessionstatedir:     ${localstatedir}/session_data
-  customdir:           ${prefix}/local
-  custometcdir:                ${customdir}/etc
-  customhtmldir:       ${customdir}/html
-  customlexdir:                ${customdir}/po
-  customlibdir:                ${customdir}/lib
-</Layout>
-<Layout inplace>
-  prefix:              `pwd`
-  exec_prefix:         ${prefix}
-  bindir:              ${exec_prefix}/bin
-  sbindir:             ${exec_prefix}/sbin
-  sysconfdir:          ${prefix}/etc
-  mandir:              ${prefix}/man
-  libdir:              ${prefix}/lib
-  datadir:             ${prefix}/share
-  htmldir:             ${prefix}/html
-  manualdir:           ${datadir}/doc
-  localstatedir:       ${prefix}/var
-  logfiledir:          ${localstatedir}/log
-  masonstatedir:       ${localstatedir}/mason_data
-  sessionstatedir:     ${localstatedir}/session_data
-  customdir:           ${prefix}/local
-  custometcdir:                ${customdir}/etc
-  customhtmldir:       ${customdir}/html
-  customlexdir:                ${customdir}/po
-  customlibdir:                ${customdir}/lib
-</Layout>
-
-<Layout FreeBSD>
-  prefix:              /usr/local
-  exec_prefix:         ${prefix}
-  bindir:              ${exec_prefix}/bin
-  sbindir:             ${exec_prefix}/sbin
-  sysconfdir:          ${prefix}/etc+
-  mandir:              ${prefix}/man
-  libdir:              ${prefix}/lib+
-  datadir:             ${prefix}/share+
-  htmldir:             ${datadir}/html
-  manualdir:           ${prefix}/share/doc+
-  logfiledir:          /var/log
-  localstatedir:       /var/run+
-  masonstatedir:       ${localstatedir}/mason_data
-  sessionstatedir:     ${localstatedir}/session_data
-  customdir:           ${prefix}/share+
-  custometcdir:                ${customdir}/local/etc
-  customhtmldir:       ${customdir}/local/html
-  customlexdir:                ${customdir}/local/po
-  customlibdir:                ${customdir}/local/lib
-</Layout>
-
-<Layout Win32>
-  prefix:              C:/Program Files/Request Tracker
-  exec_prefix:         ${prefix}
-  bindir:              ${exec_prefix}/bin
-  sbindir:             ${exec_prefix}/sbin
-  sysconfdir:          ${prefix}/etc
-  mandir:              ${prefix}/man
-  libdir:              ${prefix}/lib
-  datadir:             ${prefix}
-  htmldir:             ${datadir}/html
-  manualdir:           ${datadir}/doc
-  localstatedir:       ${prefix}/var
-  logfiledir:          ${localstatedir}/log
-  masonstatedir:       ${localstatedir}/mason_data
-  sessionstatedir:     ${localstatedir}/session_data
-  customdir:           ${prefix}/local
-  custometcdir:                ${customdir}/etc
-  customhtmldir:       ${customdir}/html
-  customlexdir:                ${customdir}/po
-  customlibdir:                ${customdir}/lib
-</Layout>

diff --git a/rt/config.layout.in b/rt/config.layout.in
new file mode 100644 (file)
index 0000000..63ed61b
--- /dev/null
+++ b/rt/config.layout.in
@@ -0,0 +1,127 @@
+##
+##  config.layout -- Pre-defined Installation Path Layouts
+##
+##  Hints:
+##  - layouts can be loaded with configure's --enable-layout=ID option
+##  - when no --enable-layout option is given, the default layout is `RT'
+##  - a trailing plus character (`+') on paths is replaced with a
+##    `/<target>' suffix where <target> is currently hardcoded to 'rt3'.
+##    (This may become a configurable parameter at some point.)
+##
+##  The following variables must _all_ be set:
+##     prefix exec_prefix bindir sbindir sysconfdir mandir libdir
+##     datadir htmldir localstatedir logfiledir masonstatedir
+##     sessionstatedir customdir customhtmldir customlexdir
+##  (This can be seen in m4/rt_layout.m4.)
+##
+
+#   Default RT3 path layout.
+<Layout RT3>
+  prefix:              /opt/rt3
+  exec_prefix:         ${prefix}
+  bindir:              ${exec_prefix}/bin
+  sbindir:             ${exec_prefix}/sbin
+  sysconfdir:          ${prefix}/etc
+  mandir:              ${prefix}/man
+  libdir:              ${prefix}/lib
+  datadir:             ${prefix}/share
+  htmldir:             ${datadir}/html
+  manualdir:           ${datadir}/doc
+  localstatedir:       ${prefix}/var
+  logfiledir:          ${localstatedir}/log
+  masonstatedir:       ${localstatedir}/mason_data
+  sessionstatedir:     ${localstatedir}/session_data
+  customdir:           ${prefix}/local
+  custometcdir:                ${customdir}/etc
+  customhtmldir:       ${customdir}/html
+  customlexdir:                ${customdir}/po
+  customlibdir:                ${customdir}/lib
+</Layout>
+<Layout inplace>
+  prefix:              `pwd`
+  exec_prefix:         ${prefix}
+  bindir:              ${exec_prefix}/bin
+  sbindir:             ${exec_prefix}/sbin
+  sysconfdir:          ${prefix}/etc
+  mandir:              ${prefix}/man
+  libdir:              ${prefix}/lib
+  datadir:             ${prefix}/share
+  htmldir:             ${prefix}/html
+  manualdir:           ${datadir}/doc
+  localstatedir:       ${prefix}/var
+  logfiledir:          ${localstatedir}/log
+  masonstatedir:       ${localstatedir}/mason_data
+  sessionstatedir:     ${localstatedir}/session_data
+  customdir:           ${prefix}/local
+  custometcdir:                ${customdir}/etc
+  customhtmldir:       ${customdir}/html
+  customlexdir:                ${customdir}/po
+  customlibdir:                ${customdir}/lib
+</Layout>
+
+<Layout FreeBSD>
+  prefix:              /usr/local
+  exec_prefix:         ${prefix}
+  bindir:              ${exec_prefix}/bin
+  sbindir:             ${exec_prefix}/sbin
+  sysconfdir:          ${prefix}/etc+
+  mandir:              ${prefix}/man
+  libdir:              ${prefix}/lib+
+  datadir:             ${prefix}/share+
+  htmldir:             ${datadir}/html
+  manualdir:           ${prefix}/share/doc+
+  logfiledir:          /var/log
+  localstatedir:       /var/run+
+  masonstatedir:       ${localstatedir}/mason_data
+  sessionstatedir:     ${localstatedir}/session_data
+  customdir:           ${prefix}/share+
+  custometcdir:                ${customdir}/local/etc
+  customhtmldir:       ${customdir}/local/html
+  customlexdir:                ${customdir}/local/po
+  customlibdir:                ${customdir}/local/lib
+</Layout>
+
+<Layout Win32>
+  prefix:              C:/Program Files/Request Tracker
+  exec_prefix:         ${prefix}
+  bindir:              ${exec_prefix}/bin
+  sbindir:             ${exec_prefix}/sbin
+  sysconfdir:          ${prefix}/etc
+  mandir:              ${prefix}/man
+  libdir:              ${prefix}/lib
+  datadir:             ${prefix}
+  htmldir:             ${datadir}/html
+  manualdir:           ${datadir}/doc
+  localstatedir:       ${prefix}/var
+  logfiledir:          ${localstatedir}/log
+  masonstatedir:       ${localstatedir}/mason_data
+  sessionstatedir:     ${localstatedir}/session_data
+  customdir:           ${prefix}/local
+  custometcdir:                ${customdir}/etc
+  customhtmldir:       ${customdir}/html
+  customlexdir:                ${customdir}/po
+  customlibdir:                ${customdir}/lib
+</Layout>
+
+<Layout Freeside>
+  prefix:              /opt/rt3
+  exec_prefix:         ${prefix}
+  bindir:              ${exec_prefix}/bin
+  sbindir:             ${exec_prefix}/sbin
+  sysconfdir:          ${prefix}/etc
+  mandir:              ${prefix}/man
+  libdir:              ${prefix}/lib
+  datadir:             ${prefix}/share
+  htmldir:             %%%FREESIDE_DOCUMENT_ROOT%%%/rt
+  manualdir:           ${datadir}/doc
+  localstatedir:       ${prefix}/var
+  logfiledir:          ${localstatedir}/log
+  masonstatedir:       ${localstatedir}/mason_data
+  sessionstatedir:     ${localstatedir}/session_data
+  customdir:           ${prefix}/local
+  custometcdir:                ${customdir}/etc
+  customhtmldir:       ${customdir}/html
+  customlexdir:                ${customdir}/po
+  customlibdir:                ${customdir}/lib
+</Layout>
+