diff options
| author | seb <seb> | 2002-12-07 16:03:12 +0000 |
|---|---|---|
| committer | seb <seb> | 2002-12-07 16:03:12 +0000 |
| commit | 6670af632bd143840e55cf84ea580c5c90be3f0c (patch) | |
| tree | 65575be8f26b70abd54847786de8b5b5e92640a5 /mk | |
| parent | aca41c78bd9121b2ee0e13cc16aeaed4f7e6db1f (diff) | |
| download | pkgsrc-6670af632bd143840e55cf84ea580c5c90be3f0c.tar.gz | |
Partially revert to behavior of revision 1.1100 wrt MESSAGE_SRC:
only if if MESSAGE_SRC and MESSAGE are _not_ already set fall back to setting
MESSAGE_SRC to ${PKGDIR}/MESSAGE if it exists.
This fix builds of mail/sendmail{,811}/.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 166a4adf811..9c8defb7284 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1102 2002/12/07 02:37:56 schmonz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1103 2002/12/07 16:03:12 seb Exp $ # # This file is in the public domain. # @@ -557,17 +557,19 @@ DEINSTALL_FILE= ${PKGDIR}/DEINSTALL # list of files to be concatenated together to generate the MESSAGE file. # .if !defined(MESSAGE_SRC) && !defined(MESSAGE) -. if exists(${PKGDIR}/MESSAGE.common) +. if exists(${PKGDIR}/MESSAGE) +MESSAGE_SRC= ${PKGDIR}/MESSAGE +. else +. if exists(${PKGDIR}/MESSAGE.common) MESSAGE_SRC= ${PKGDIR}/MESSAGE.common -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}) +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}) MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}.${MACHINE_ARCH:C/i[3-6]86/i386/g}) +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}.${MACHINE_ARCH:C/i[3-6]86/i386/g}) MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}.${MACHINE_ARCH:C/i[3-6]86/i386/g} +. endif . endif -.elif exists(${PKGDIR}/MESSAGE) -MESSAGE_SRC= ${PKGDIR}/MESSAGE .endif .if defined(MESSAGE_SRC) |