diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
| commit | 23c0de20b065b4680065b8801fa4dbad19abd9ca (patch) | |
| tree | 980e667588739e64d32ee796e35e3a4caea2000c /mail | |
| parent | Upgrade to the 2000-01-10 GCC 2.96 development snapshot. (diff) | |
Do not include bsd.port.pre.mk twice (once in the slave and once in the
master). This is done by defining a variable "PRE_MK_INCLUDED" in the slave
before including ${MASTERDIR}/Makefile, and have the master check it before
including any necessary macro files.
Notes
Notes:
svn path=/head/; revision=24794
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/pine4-ssl/Makefile | 1 | ||||
| -rw-r--r-- | mail/pine4/Makefile | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mail/pine4-ssl/Makefile b/mail/pine4-ssl/Makefile index 420615668adf..8913d4217dce 100644 --- a/mail/pine4-ssl/Makefile +++ b/mail/pine4-ssl/Makefile @@ -48,4 +48,5 @@ do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf EXTRAAUTHENTICATORS=ssl) .endif +PRE_MK_INCLUDED= yes .include "${MASTERDIR}/Makefile" diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile index c3e3ae471a46..93e4427b6648 100644 --- a/mail/pine4/Makefile +++ b/mail/pine4/Makefile @@ -77,4 +77,9 @@ post-install: ${PREFIX}/bin/pine -P ${PREFIX}/etc/pine.conf -conf >${WRKSRC}/pine.conf ${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf +# hack to allow slave ports to include bsd.port.pre.mk and then this file +.if defined(PRE_MK_INCLUDED) +.include <bsd.port.post.mk> +.else .include <bsd.port.mk> +.endif |