Prepare for 0.1.1.0; add --qmailrundir

1 files changed, 12 insertions, 7 deletions

diff --git a/configure b/configure
index 241a8ad..483e360 100755
--- a/configure
+++ b/configure
@@ -25,7 +25,8 @@ Fine tuning of the installation directories:
   --includedir=DIR              C header files [PREFIX/include]
   --sysconfdir=DIR              global configuration files [PREFIX/etc]
   --pkgconfdir=DIR              pkg-config .pc files [PREFIX/lib/pkgconfig]
-  --qmaildir=DIR                qmail installation directory [/var/qmail]
+  --qmaildir=QMAILDIR           qmail installation directory [/var/qmail]
+  --qmailrundir=QMAILRUNDIR     directory for run-time files [QMAILDIR/run]
 
  If no --prefix option is given, by default libdir (but not dynlibdir) will be
  /usr/lib, and includedir will be /usr/include.
@@ -50,7 +51,6 @@ Optional features:
   --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       hardcode absolute BINDIR/foobar paths in binaries [disabled]
-  --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]
 EOF
@@ -173,7 +173,8 @@ deplibpath=''
 vpaths=''
 vpathd=''
 build=
-qmailhome=/var/qmail
+qmaildir=/var/qmail
+qmailrundir='$qmaildir/run'
 qmailrids=qmailr:qmail
 qmailinstall=false
 
@@ -215,7 +216,8 @@ for arg ; do
     --disable-slashpackage) sproot= ; slashpackage=false ;;
     --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;;
     --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;;
-    --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 ;;
@@ -247,7 +249,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot qmailhome ; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot qmaildir qmailrundir ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -529,7 +531,8 @@ if $allpic ; then
 else
   echo "STATIC_LIBS_ARE_PIC :="
 fi
-echo "QMAIL_HOME := $qmailhome"
+echo "QMAIL_HOME := $qmaildir"
+echo "QMAIL_RUN := $qmailrundir"
 echo "QMAILR_IDS := $qmailrids"
 if $qmailinstall ; then
   echo 'INSTALL_QMAIL := 1'
@@ -568,7 +571,9 @@ fi
 echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
 echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\""
 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\""
 
 echo
 echo "#endif"