6 files changed, 18 insertions, 6 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index d0af7a0..abc541f 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,2 +1,4 @@
-    --with-qmail-home=*) qmailhome=${arg#*=} ;;
+    --qmaildir=*) qmailhome=${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_generate_make b/package/configure-snippets/configure_generate_make
index 54fa00c..83bdb9d 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -1,3 +1,7 @@
 echo "QMAIL_HOME := $qmailhome"
 echo "QMAILR_IDS := $qmailrids"
-
+if $qmailinstall ; then
+  echo 'INSTALL_QMAIL := 1'
+else
+  echo 'INSTALL_QMAIL :='
+fi
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index 8b13789..4ae3171 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -1 +1,2 @@
+  --qmaildir=DIR                qmail installation directory [/var/qmail]
 
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index b439bc5..769f3a2 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1,3 +1,3 @@
-  --with-qmail-home=DIR       qmail installation directory [/var/qmail]
-  --with-qmailr-ids=uid:gid   qmail-remote user:group [qmailr:qmail]
-
+  --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 a30b387..2a2dd1c 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,2 +1,3 @@
 qmailhome=/var/qmail
 qmailrids=qmailr:qmail
+qmailinstall=false
diff --git a/package/targets.mak b/package/targets.mak
index f957f22..2f572dc 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -5,7 +5,9 @@ qmail-remote-io
 
 LIBEXEC_TARGETS :=
 
-EXTRA_INSTALL += install-qmailr
+ifdef INSTALL_QMAIL
+
+install: install-qmailr
 
 QMAILR_UID := $(firstword $(subst :, ,$(QMAILR_IDS)))
 QMAILR_GID := $(lastword $(subst :, ,$(QMAILR_IDS)))
@@ -21,3 +23,5 @@ install-qmailr:
 	touch -- $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
 	chown -- $(QMAILR_IDS) $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
 	chmod 0640 $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
+
+endif