diff options
| author | jlam <jlam@pkgsrc.org> | 2007-10-25 17:49:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-10-25 17:49:45 +0000 |
| commit | 38c496d6c0f80dd3c6c3c2b59bf1eec539fc241d (patch) | |
| tree | de8ca6719f85edb0d1f7884b0b04298bbe8a840b /mk | |
| parent | 56ba4d26906035375d68907b5ecea5c345617179 (diff) | |
| download | pkgsrc-38c496d6c0f80dd3c6c3c2b59bf1eec539fc241d.tar.gz | |
Re-add "intentionally empty" PLISTs for meta-packages and other packages
that directly manipulate empty PLISTs.
Modify plist/plist.mk so that if the PLIST files are missing and no
GENERATE_PLIST is defined, then the package fails to build.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/plist/plist.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 0f977b0109f..5dab832656a 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.33 2007/10/25 16:46:14 jlam Exp $ +# $NetBSD: plist.mk,v 1.34 2007/10/25 17:49:45 jlam Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -171,12 +171,12 @@ _SHLIB_AWKFILE.none= ${.CURDIR}/../../mk/plist/shlib-none.awk # that outputs contents for a PLIST to stdout and is appended to # the contents of ${PLIST_SRC}. # -.if !empty(PLIST_SRC) -GENERATE_PLIST?= ${TRUE}; -.else -GENERATE_PLIST?= ${ECHO} "@comment "${PKGNAME:Q}" has no files"; +.if empty(PLIST_SRC) && empty(GENERATE_PLIST) +PKG_FAIL_REASON+= "Missing PLIST file or GENERATE_PLIST definition." .endif +GENERATE_PLIST?= ${TRUE}; + .if ${PKG_INSTALLATION_TYPE} == "pkgviews" # # _PLIST_IGNORE_FILES basically mirrors the list of ignored files found @@ -216,11 +216,7 @@ _GENERATE_PLIST= \ ${SED} -e "s|^${DESTDIR}${PREFIX}/|@unexec ${RMDIR} -p %D/|" \ -e "s,$$, 2>/dev/null || ${TRUE},"; .else -. if !empty(PLIST_SRC) -_GENERATE_PLIST= ${CAT} ${PLIST_SRC}; ${GENERATE_PLIST} -. else -_GENERATE_PLIST= ${GENERATE_PLIST} -. endif +_GENERATE_PLIST= ${CAT} /dev/null ${PLIST_SRC}; ${GENERATE_PLIST} .endif .PHONY: plist |