From 6509394546a8abeed7d63ccf820119aace418a0c Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Mon, 31 Mar 2008 11:41:09 +0000
Subject: Separate 'make clean' from 'make package', so that clean is not
 skipped with -r.  DISTNAME++.  Fixes PR pkg/38283.

Reviewed and tested by tnn@.
---
 pkgtools/pkg_rolling-replace/Makefile                     |  4 ++--
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'pkgtools/pkg_rolling-replace')

diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index 8cd3966bc0b..ac94a3e5651 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2008/02/17 10:47:47 apb Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/31 11:41:09 gdt Exp $
 
-DISTNAME=	pkg_rolling-replace-0.14
+DISTNAME=	pkg_rolling-replace-0.15
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index 40db40a38ea..8b1bb070541 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.17 2008/02/17 10:47:47 apb Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.18 2008/03/31 11:41:09 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -399,9 +399,10 @@ while [ -n "$REPLACE_TODO" ]; do
 	[ -z "$(${PKG_INFO} -Q rebuild $pkg)" ] || \
 	    abort "package $pkg is still requested to be rebuilt."
     fi
+    # If -r not given, make a binary package.
     if [ -z "$opt_r" ]; then
 	echo "${OPI} Packaging $(${PKG_INFO} -e $pkg)"
-	    cmd="${MAKE} package && ${MAKE} clean || fail=1"
+	    cmd="${MAKE} package || fail=1"
 	if [ -n "$opt_n" ]; then
 	    echo "${OPI} Would run: $cmd"
 	else
@@ -409,6 +410,11 @@ while [ -n "$REPLACE_TODO" ]; do
     	    [ -z "$fail" ] || abort "'make package' failed for package $pkg."
 	fi
     fi
+    # Clean
+    if [ -z "$opt_n" ]; then
+	${MAKE} clean || abort "'make clean' failed for package $pkg."
+    fi
+
     sleep 1
 
     # remove just-replaced package from all *_TODO lists
-- 
cgit v1.2.3