diff options
| author | veego <veego@pkgsrc.org> | 2005-02-27 22:10:25 +0000 |
|---|---|---|
| committer | veego <veego@pkgsrc.org> | 2005-02-27 22:10:25 +0000 |
| commit | d53b01d2218a9c446e167fa75883bf489e68671e (patch) | |
| tree | 486a61272ee5447667858558313a7f765089e498 /mk | |
| parent | e57735a4e2140e65b09902b914c95a946ce2d8fc (diff) | |
| download | pkgsrc-d53b01d2218a9c446e167fa75883bf489e68671e.tar.gz | |
Fix PLIST_SRC error introduced in rev 1.1593.
Before this fix it would include
PLIST.common
then _only_ one of the following
PLIST.${OPSYS}
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST
and then PLIST.common_end.
Now, uses all of the following PLIST files, in that order:
PLIST.common
PLIST.${OPSYS}
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST
PLIST.common_end
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f5ca24b29bd..01494ad66dc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1595 2005/02/25 13:05:52 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1596 2005/02/27 22:10:25 veego Exp $ # # This file is in the public domain. # @@ -107,11 +107,14 @@ PLIST_SRC+= ${PKGDIR}/PLIST.common . endif . if exists(${PKGDIR}/PLIST.${OPSYS}) PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS} -. elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}) +. endif +. if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}) PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g} -. elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) +. endif +. if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} -. elif exists(${PKGDIR}/PLIST) +. endif +. if exists(${PKGDIR}/PLIST) PLIST_SRC+= ${PKGDIR}/PLIST . endif . if exists(${PKGDIR}/PLIST.common_end) |