diff options
| author | tnn <tnn@pkgsrc.org> | 2007-05-23 18:11:05 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2007-05-23 18:11:05 +0000 |
| commit | 78d44d2c115d6852fa3885c9d39fafb39c21384e (patch) | |
| tree | 98618abb840dce04a90ba476d9fce8d66d6fb2ce /pkgtools | |
| parent | 00ccdcf6b5f68539f505755fc29763b52fa87e06 (diff) | |
| download | pkgsrc-78d44d2c115d6852fa3885c9d39fafb39c21384e.tar.gz | |
non-current make(1) doesn't support -V.
Provide a target for printing PKGSRCDIR. PKGREVISION++
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_rolling-replace/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index 0195557f952..4c89bb5b3d4 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2007/05/20 13:35:55 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2007/05/23 18:11:05 tnn Exp $ DISTNAME= pkg_rolling-replace-0.04 -PKGREVISION= 6 +PKGREVISION= 7 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 1a4e0d2c806..661a29fc705 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.5 2007/05/20 13:35:56 tnn Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.6 2007/05/23 18:11:05 tnn Exp $ #<license> # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -67,7 +67,9 @@ MAKE="@MAKE@" test -z "$PKG_DBDIR" && PKG_DBDIR=/var/db/pkg test -z "$MAKECONF" && MAKECONF="@MAKECONF@" test -f "$MAKECONF" && test -z "$PKGSRCDIR" && \ - PKGSRCDIR="`$MAKE -f \"$MAKECONF\" BSD_PKG_MK=1 -V PKGSRCDIR`" + PKGSRCDIR="`(cat "$MAKECONF"; \ + printf '\n_print_pkgsrcdir:\n\t@echo "${PKGSRCDIR}"\n') | \ + "$MAKE" BSD_PKG_MK=1 -f - _print_pkgsrcdir`" test -z "$PKGSRCDIR" && PKGSRCDIR=/usr/pkgsrc unset PKG_PATH || true #or pkgsrc makefiles will complain |