kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Preserve the default value of PLIST_SRC as PLIST_SRC_DFLT while still

Browse source 
allowing PLIST_SRC to be overridden in a package Makefile.

It's now possible to do:

	PLIST_SRC=	${PLIST_SRC_DFLT} ${WRKDIR}/PLIST_DYNAMIC

and still use the default PLIST.* fragment handling.
This commit is contained in:
jlam 2007-07-18 14:12:30 +00:00
parent 9b00c3e863
commit 12d6ee2282
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
mk/plist/plist.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: plist.mk,v 1.25 2007/06/09 11:02:23 rillig Exp $
# $NetBSD: plist.mk,v 1.26 2007/07/18 14:12:30 jlam Exp $
#
# This Makefile fragment handles the creation of PLISTs for use by
# pkg_create(8).
@ -37,26 +37,25 @@ PLIST_TYPE?= static
######################################################################
.if !defined(PLIST_SRC)
. if exists(${PKGDIR}/PLIST.common)
PLIST_SRC+= ${PKGDIR}/PLIST.common
. endif
. if exists(${PKGDIR}/PLIST.${OPSYS})
PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}
. 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}
. 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}
. endif
. if exists(${PKGDIR}/PLIST)
PLIST_SRC+= ${PKGDIR}/PLIST
. endif
. if exists(${PKGDIR}/PLIST.common_end)
PLIST_SRC+= ${PKGDIR}/PLIST.common_end
. endif
.endif # !PLIST_SRC
.if exists(${PKGDIR}/PLIST.common)
PLIST_SRC_DFLT+= ${PKGDIR}/PLIST.common
.endif
.if exists(${PKGDIR}/PLIST.${OPSYS})
PLIST_SRC_DFLT+= ${PKGDIR}/PLIST.${OPSYS}
.endif
.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
PLIST_SRC_DFLT+= ${PKGDIR}/PLIST.${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_DFLT+= ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
.endif
.if exists(${PKGDIR}/PLIST)
PLIST_SRC_DFLT+= ${PKGDIR}/PLIST
.endif
.if exists(${PKGDIR}/PLIST.common_end)
PLIST_SRC_DFLT+= ${PKGDIR}/PLIST.common_end
.endif
PLIST_SRC?= ${PLIST_SRC_DFLT}
# This is the path to the generated PLIST file.
PLIST= ${WRKDIR}/.PLIST