Module Name: src
Committed By: tron
Date: Tue Feb 15 23:17:02 UTC 2011
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
Move default definition of "PKGROOT" inside the "HAVE_CYRUS_SASL" block
as it shouldn't be used anywhere else.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.9 src/external/ibm-public/postfix/Makefile.inc:1.10
--- src/external/ibm-public/postfix/Makefile.inc:1.9 Tue Feb 15 16:19:33 2011
+++ src/external/ibm-public/postfix/Makefile.inc Tue Feb 15 23:17:02 2011
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.9 2011/02/15 16:19:33 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2011/02/15 23:17:02 tron Exp $
.include <bsd.own.mk>
USE_FORT?= yes # network client and server
-PKGROOT?= /usr/pkg
WARNS?= 0
@@ -32,6 +31,7 @@
# XXX: Use only if you have cyrus-sasl installed; never part of a normal build!
.if defined(HAVE_CYRUS_SASL)
+PKGROOT?= /usr/pkg
CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \
-I${PKGROOT}/include/sasl
LDADD+= -L${PKGROOT}/lib -Wl,-R${PKGROOT}/lib -lsasl2
