summaryrefslogtreecommitdiff
path: root/mail/procmail
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1997-03-06 04:31:46 +0000
committerSatoshi Asami <asami@FreeBSD.org>1997-03-06 04:31:46 +0000
commitbd77d4ec4695ef7a97b3de8d7417586481e04e2d (patch)
tree195063c7b72e78e1f0ca424e7111ab3739e0e88b /mail/procmail
parentConditionalize the question asking to !defined(PACKAGE_BUILDING). (diff)
Conditionalize question about file locking test to
!defined(PACKAGE_BUILDING).
Notes
Notes: svn path=/head/; revision=5868
Diffstat (limited to 'mail/procmail')
-rw-r--r--mail/procmail/Makefile4
-rw-r--r--mail/procmail/files/patch-aa12
2 files changed, 15 insertions, 1 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 5ed17a751ae8..887a56da5696 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 September 1994
# Whom: adam
#
-# $Id: Makefile,v 1.21 1996/11/10 21:32:41 obrien Exp $
+# $Id: Makefile,v 1.22 1996/11/18 14:04:33 asami Exp $
#
DISTNAME= procmail-3.11pre4
@@ -16,7 +16,9 @@ MAINTAINER= ache@FreeBSD.ORG
# It asks for list af directories to do test for file locking
# (defaults to /tmp and ".", so return should suffice in most cases).
+.if !defined(PACKAGE_BUILDING) # handled in patch-aa
IS_INTERACTIVE= yes
+.endif
MAN1= procmail.1 formail.1 lockfile.1
MAN5= procmailex.5 procmailrc.5 procmailsc.5
diff --git a/mail/procmail/files/patch-aa b/mail/procmail/files/patch-aa
index a886b9320f22..f9a5770720ff 100644
--- a/mail/procmail/files/patch-aa
+++ b/mail/procmail/files/patch-aa
@@ -9,6 +9,18 @@
# For display in the man pages
VISIBLE_BASENAME= $(BASENAME)
+@@ -53,7 +53,11 @@
+
+ # Makefile.0 - mark, don't (re)move this, a sed script needs it
+
++.if defined(PACKAGE_BUILDING)
++LOCKINGTEST=/tmp .
++.else
+ LOCKINGTEST=__defaults__
++.endif
+
+ #LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit.
+ # If LOCKINGTEST is defined, autoconf will NOT
@@ -86,7 +86,7 @@
-Waggregate-return #-Wuninitialized