diff options
Diffstat (limited to 'package/configure-snippets')
7 files changed, 12 insertions, 7 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index abc541f..ce78996 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -1,4 +1,5 @@ - --qmaildir=*) qmailhome=${arg#*=} ;; + --qmaildir=*) qmaildir=${arg#*=} ;; + --qmailrundir=*) qmailrundir=${arg#*=} ;; --with-qmailr-ids=*) qmailrids=${arg#*=} ;; --enable-qmail-install|--enable-qmail-install=yes) qmailinstall=true ;; --disable-qmail-install|--enable-qmail-install=no) qmailinstall=false ;; diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs index f9a8b46..48dec28 100644 --- a/package/configure-snippets/configure_expand_dirs +++ b/package/configure-snippets/configure_expand_dirs @@ -1 +1 @@ -qmailhome +qmaildir qmailrundir diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index d9bcacf..65353b6 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -1,3 +1,5 @@ echo "#undef ${package_macro_name}_QMAIL_HOME" -echo "#define ${package_macro_name}_QMAIL_HOME \"$qmailhome\"" +echo "#define ${package_macro_name}_QMAIL_HOME \"$qmaildir\"" +echo "#undef ${package_macro_name}_QMAIL_RUN" +echo "#define ${package_macro_name}_QMAIL_RUN \"$qmailrundir\"" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index 83bdb9d..1c51b42 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -1,4 +1,5 @@ -echo "QMAIL_HOME := $qmailhome" +echo "QMAIL_HOME := $qmaildir" +echo "QMAIL_RUN := $qmailrundir" echo "QMAILR_IDS := $qmailrids" if $qmailinstall ; then echo 'INSTALL_QMAIL := 1' diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install index 4ae3171..3a24c59 100644 --- a/package/configure-snippets/configure_help_install +++ b/package/configure-snippets/configure_help_install @@ -1,2 +1,3 @@ - --qmaildir=DIR qmail installation directory [/var/qmail] + --qmaildir=QMAILDIR qmail installation directory [/var/qmail] + --qmailrundir=QMAILRUNDIR directory for run-time files [QMAILDIR/run] diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index 769f3a2..680fc72 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -1,3 +1,2 @@ - --with-qmail-home=DIR qmail installation directory [/var/qmail] --with-qmailr-ids=uid:gid qmail-remote user:group [qmailr:qmail] --enable-qmail-install setup qmail to use qmail-remote [disabled] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index 2a2dd1c..c8b1560 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -1,3 +1,4 @@ -qmailhome=/var/qmail +qmaildir=/var/qmail +qmailrundir='$qmaildir/run' qmailrids=qmailr:qmail qmailinstall=false |