diff options
| author | tnn <tnn@pkgsrc.org> | 2007-05-23 18:59:46 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2007-05-23 18:59:46 +0000 |
| commit | b328843d3efa2f754981047946e1ed350a6bbe43 (patch) | |
| tree | d7316f7ceec511b346b886f13caf50aec6736f04 /pkgtools | |
| parent | 78d44d2c115d6852fa3885c9d39fafb39c21384e (diff) | |
| download | pkgsrc-b328843d3efa2f754981047946e1ed350a6bbe43.tar.gz | |
simplify previous
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 661a29fc705..44edf67a464 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.6 2007/05/23 18:11:05 tnn Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.7 2007/05/23 18:59:46 tnn Exp $ #<license> # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -66,10 +66,9 @@ MAKE="@MAKE@" test -z "$PKG_DBDIR" && PKG_DBDIR=/var/db/pkg test -z "$MAKECONF" && MAKECONF="@MAKECONF@" -test -f "$MAKECONF" && test -z "$PKGSRCDIR" && \ - PKGSRCDIR="`(cat "$MAKECONF"; \ - printf '\n_print_pkgsrcdir:\n\t@echo "${PKGSRCDIR}"\n') | \ - "$MAKE" BSD_PKG_MK=1 -f - _print_pkgsrcdir`" +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`" test -z "$PKGSRCDIR" && PKGSRCDIR=/usr/pkgsrc unset PKG_PATH || true #or pkgsrc makefiles will complain |