diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-18 14:12:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-18 14:12:30 +0000 |
| commit | 12d6ee2282d1db38c2a4160286df836df7e695f0 (patch) | |
| tree | 0068ab9ca9cb5eb733f2a21feb6f22b59f5f8469 /mk | |
| parent | 9b00c3e863eeac743826c7ea3bf015b9e377b75c (diff) | |
| download | pkgsrc-12d6ee2282d1db38c2a4160286df836df7e695f0.tar.gz | |
Preserve the default value of PLIST_SRC as PLIST_SRC_DFLT while still
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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/plist/plist.mk | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 2a768bffe8e..5ba1e8fdf1f 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -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 |