summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2007-06-05 08:22:32 +0000
committertnn <tnn@pkgsrc.org>2007-06-05 08:22:32 +0000
commit7987ab0850afee2d071195728e9524c11b14de10 (patch)
tree112a96d2c4481a2086d8dfd83b833d5e0da4ae38
parentf9ca475dd5706c6d851bb57a8be6f8c80c20e7c3 (diff)
downloadpkgsrc-7987ab0850afee2d071195728e9524c11b14de10.tar.gz
make(1) variable assignments should go after all command line options.
-rwxr-xr-xpkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index 44edf67a464..4cfed9427b6 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.7 2007/05/23 18:59:46 tnn Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.8 2007/06/05 08:22:32 tnn Exp $
#<license>
# Copyright (c) 2006 BBN Technologies Corp. All rights reserved.
#
@@ -68,7 +68,7 @@ test -z "$PKG_DBDIR" && PKG_DBDIR=/var/db/pkg
test -z "$MAKECONF" && MAKECONF="@MAKECONF@"
test -f "$MAKECONF" && test -z "$PKGSRCDIR" && PKGSRCDIR="` \
printf '.include "%s"\n_print_pkgsrcdir:\n\t@echo "${PKGSRCDIR}"\n' \
- "$MAKECONF" | "$MAKE" BSD_PKG_MK=1 -f - _print_pkgsrcdir`"
+ "$MAKECONF" | "$MAKE" -f - BSD_PKG_MK=1 _print_pkgsrcdir`"
test -z "$PKGSRCDIR" && PKGSRCDIR=/usr/pkgsrc
unset PKG_PATH || true #or pkgsrc makefiles will complain