diff options
| author | jlam <jlam> | 2006-04-16 04:27:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-16 04:27:17 +0000 |
| commit | 10aaf47d36fedcce5967c34d03539d1f6480b738 (patch) | |
| tree | fbd3cdc79c5f8b88b5ef6d73bf00635cce04f9b4 /mk/plist/plist.mk | |
| parent | 2350aeb2af2a32796317ca2955116aa16e6ec083 (diff) | |
| download | pkgsrc-10aaf47d36fedcce5967c34d03539d1f6480b738.tar.gz | |
Now that all info file entries have been pushed from INFO_FILES into
the PLISTs, drop support for listing info files in INFO_FILES. The
INFO_FILES variable is now strictly defined/undefined.
Diffstat (limited to 'mk/plist/plist.mk')
| -rw-r--r-- | mk/plist/plist.mk | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index e831679bf74..b52c3adac65 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.8 2006/04/05 05:54:01 jlam Exp $ +# $NetBSD: plist.mk,v 1.9 2006/04/16 04:27:18 jlam Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -173,18 +173,6 @@ _SHLIB_TYPE_cmd= \ # GENERATE_PLIST?= ${TRUE}; -# XXX Generate info page entries for each of the listed INFO_FILES. -# XXX This section should go away after info file listings have been -# XXX pushed into the PLISTs. -# XXX -.if defined(INFO_FILES) && !empty(INFO_FILES) -. for _file_ in ${INFO_FILES} -_INFO_GENERATE_PLIST+= ${ECHO} "info/"${_file_:Q}; -. endfor -.else -_INFO_GENERATE_PLIST= ${TRUE}; -.endif - .if ${PKG_INSTALLATION_TYPE} == "pkgviews" # # _PLIST_IGNORE_FILES basically mirrors the list of ignored files found @@ -224,8 +212,7 @@ _GENERATE_PLIST= \ ${SED} -e "s|^${PREFIX}/|@unexec ${RMDIR} -p %D/|" \ -e "s,$$, 2>/dev/null || ${TRUE},"; .else -_GENERATE_PLIST= { ${_INFO_GENERATE_PLIST} }; \ - ${CAT} ${PLIST_SRC}; \ +_GENERATE_PLIST= ${CAT} ${PLIST_SRC}; \ ${GENERATE_PLIST} .endif @@ -243,12 +230,8 @@ ${PLIST}: > ${.TARGET} .if defined(INFO_FILES) -. if empty(INFO_FILES) INFO_FILES_cmd= \ ${CAT} ${PLIST} | \ ${SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_INFO_AWK} | \ ${AWK} '($$0 !~ "-[0-9]*(\.gz)?$$") { print }' -. else -INFO_FILES_cmd= ${TRUE} -. endif .endif |