diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-10 04:03:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-10 04:03:23 +0000 |
| commit | be040a55a4c9eb82e6129c32da5eec8d38dafe5d (patch) | |
| tree | 826c7ab57ff328734c9f0062f19176ca6ec1b28d | |
| parent | 6ea0c2868e54502f4ba4877dbceaf8a35cca496a (diff) | |
| download | pkgsrc-be040a55a4c9eb82e6129c32da5eec8d38dafe5d.tar.gz | |
Rename the generate-metadata and clean-metadata targets to _flavor- style
names to indicate that they are purely private to flavor/pkg.
| -rw-r--r-- | mk/flavor/pkg/install.mk | 6 | ||||
| -rw-r--r-- | mk/flavor/pkg/metadata.mk | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk index e813b027939..5b8f8020426 100644 --- a/mk/flavor/pkg/install.mk +++ b/mk/flavor/pkg/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.11 2007/08/10 04:00:43 jlam Exp $ +# $NetBSD: install.mk,v 1.12 2007/08/10 04:03:23 jlam Exp $ # # _flavor-check-conflicts: # Checks for conflicts between the package and installed packages. @@ -57,7 +57,7 @@ _REGISTER_DEPENDENCIES= \ AWK=${TOOLS_AWK:Q} \ ${SH} ${PKGSRCDIR}/mk/flavor/pkg/register-dependencies -_flavor-register: .PHONY generate-metadata ${_RDEPENDS_FILE} +_flavor-register: .PHONY _flavor-generate-metadata ${_RDEPENDS_FILE} @${STEP_MSG} "Registering installation for ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME} @@ -70,4 +70,4 @@ _flavor-register: .PHONY generate-metadata ${_RDEPENDS_FILE} ${_PKG_SILENT}${_PKG_DEBUG}${_FULL_DEPENDS_CMD} | \ ${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME} -_flavor-install-clean: .PHONY clean-metadata +_flavor-install-clean: .PHONY _flavor-clean-metadata diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index c3073e76d47..6ce115b5424 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.24 2007/07/02 14:54:10 joerg Exp $ +# $NetBSD: metadata.mk,v 1.25 2007/08/10 04:03:23 jlam Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -374,10 +374,10 @@ ${_CONTENTS_FILE}: ${_CONTENTS_TARGETS} ${PKG_CREATE} ${_PKG_ARGS_INSTALL} -O ${PKGFILE:T} > ${.TARGET} ###################################################################### -### generate-metadata (PRIVATE) +### _flavor-generate-metadata (PRIVATE) ###################################################################### -### generate-metadata is a convenience target for generating all of -### the pkgsrc binary package meta-data files. It populates +### _flavor-generate-metadata is a convenience target for generating +### all of the pkgsrc binary package meta-data files. It populates ### ${PKG_DB_TMPDIR} with the following files: ### ### +BUILD_INFO @@ -392,15 +392,15 @@ ${_CONTENTS_FILE}: ${_CONTENTS_TARGETS} ### ### See the targets above for descriptions of each of those files. ### -.PHONY: generate-metadata -generate-metadata: ${_METADATA_TARGETS} +.PHONY: _flavor-generate-metadata +_flavor-generate-metadata: ${_METADATA_TARGETS} ###################################################################### -### clean-metadata (PRIVATE) +### _flavor-clean-metadata (PRIVATE) ###################################################################### -### clean-metadata is a convenience target for removing the meta-data -### directory. +### _flavor-clean-metadata is a convenience target for removing the +### meta-data directory. ### -.PHONY: clean-metadata -clean-metadata: +.PHONY: _flavor-clean-metadata +_flavor-clean-metadata: ${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${PKG_DB_TMPDIR} |