Actually use PKG_DBDIR and PKGSRCDIR values from the build process,

rather than just pretending to.  I know I meant this to work, but
somehow I forgot actually to make it work a long time ago.

Addresses a problem pointed out in private email.
This commit is contained in:
atatat 2005-06-26 17:34:19 +00:00
parent 0c5da5c615
commit b1f7ff373a
2 changed files with 5 additions and 5 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.20 2005/06/17 03:50:29 jlam Exp $
# $NetBSD: Makefile,v 1.21 2005/06/26 17:34:19 atatat Exp $
#
DISTNAME= pkgdepgraph-2.7
DISTNAME= pkgdepgraph-2.8
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty

View file

@ -3,7 +3,7 @@
# Copyright (c) 2002, 2003, 2004 by Andrew Brown <atatat@netbsd.org>
# Absolutely no warranty.
# $NetBSD: pkgdepgraph.pl,v 1.10 2004/07/28 01:42:43 atatat Exp $
# $NetBSD: pkgdepgraph.pl,v 1.11 2005/06/26 17:34:19 atatat Exp $
# pkgdepgraph: @DISTVER@
use strict;
@ -66,8 +66,8 @@ die("$iam: -D, -F, -m, and -R are mutually exclusive -- please pick one\n")
($target ne "") +
($rebuild ne "") > 1);
$pkg_dbdir ||= $ENV{'PKG_DBDIR'} || "/var/db/pkg";
$pkgsrcdir ||= $ENV{'PKGSRCDIR'} || "/usr/pkgsrc";
$pkg_dbdir ||= $ENV{'PKG_DBDIR'} || "@PKG_DBDIR@";
$pkgsrcdir ||= $ENV{'PKGSRCDIR'} || "@PKGSRCDIR@";
$packages = $ENV{'PKG_PATH'} if (!$packages);
$packages = $ENV{'PACKAGES'} . "/All" if (!$packages && $ENV{'PACKAGES'});
$packages = $pkgsrcdir . "/packages/All" if (!$packages);