summaryrefslogtreecommitdiff
path: root/mk/package
diff options
context:
space:
mode:
authorcheusov <cheusov>2012-10-02 22:45:47 +0000
committercheusov <cheusov>2012-10-02 22:45:47 +0000
commit5271dd29a2c126cd5153b55ac5917360d0265609 (patch)
treec0a378cb47df4f43b2953699efbce4290bb54276 /mk/package
parentb4c1be6ec9b351e4b7c101d498a9cc66ed856147 (diff)
downloadpkgsrc-5271dd29a2c126cd5153b55ac5917360d0265609.tar.gz
Fixes for target "repackage"
Diffstat (limited to 'mk/package')
-rw-r--r--mk/package/bsd.package.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk
index 27a7de50166..a7d2c4553d0 100644
--- a/mk/package/bsd.package.mk
+++ b/mk/package/bsd.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.15 2012/05/27 14:32:28 cheusov Exp $
+# $NetBSD: bsd.package.mk,v 1.16 2012/10/02 22:45:47 cheusov Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to binary packages.
@@ -23,9 +23,8 @@ _COOKIE.package= ${WRKDIR}/.package_done
### repackage is a special target to re-run the package target.
###
.PHONY: repackage
-.if !target(repackage)
-repackage: package-eat-cookie package
-.endif
+repackage: _package-clean
+ ${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} package
######################################################################
### package-clean (PUBLIC)
@@ -43,7 +42,7 @@ package-clean: package-eat-cookie
### _package-clean (PRIVATE)
######################################################################
### _package-clean removes the state files for the "_package-clean" and
-### later phases so that the "test" target may be re-invoked.
+### later phases so that the "package" target may be re-invoked.
###
.PHONY: _package-clean
_package-clean: package-eat-cookie plist-clean check-files-clean
@@ -56,4 +55,4 @@ _package-clean: package-eat-cookie plist-clean check-files-clean
### phase so that the "package" target may be re-invoked.
###
package-eat-cookie:
- ${RUN} ${RM} -f ${_COOKIE.package}
+ ${RUN} ${RM} -f ${_COOKIE.package} ${_COOKIE.install}