small hack to make these work even if PORTSDIR is not set and non-standard,
since the lib are supposed to be in the same relative location.
This commit is contained in:
parent
f346c0f658
commit
2d255d213d
@ -1,7 +1,7 @@
|
||||
#! /usr/bin/perl
|
||||
|
||||
# ex:ts=8 sw=4:
|
||||
# $OpenBSD: dpb,v 1.10 2010/11/01 12:24:47 espie Exp $
|
||||
# $OpenBSD: dpb,v 1.11 2010/12/29 12:28:23 espie Exp $
|
||||
#
|
||||
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
|
||||
#
|
||||
@ -20,10 +20,11 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
my $ports1;
|
||||
use FindBin;
|
||||
BEGIN {
|
||||
$ports1 = $ENV{PORTSDIR} || '/usr/ports';
|
||||
}
|
||||
use lib "$ports1/infrastructure/lib";
|
||||
use lib ("$ports1/infrastructure/lib", "$FindBin::Bin/../lib");
|
||||
use DPB::PkgPath;
|
||||
use DPB::Core;
|
||||
use DPB::Vars;
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/perl
|
||||
# $OpenBSD: libtool,v 1.29 2010/12/07 08:46:28 espie Exp $
|
||||
# $OpenBSD: libtool,v 1.30 2010/12/29 12:28:23 espie Exp $
|
||||
|
||||
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
|
||||
#
|
||||
@ -24,11 +24,12 @@ use File::Glob ':glob';
|
||||
use File::Path;
|
||||
use Getopt::Long;
|
||||
use Getopt::Std;
|
||||
use FindBin;
|
||||
my $ports1;
|
||||
BEGIN {
|
||||
$ports1 = $ENV{PORTSDIR} || '/usr/ports';
|
||||
}
|
||||
use lib "$ports1/infrastructure/lib/LibTool";
|
||||
use lib ("$ports1/infrastructure/lib/LibTool", "$FindBin::Bin/../lib/LibTool");
|
||||
use Trace;
|
||||
use Exec;
|
||||
use Parser;
|
||||
|
Loading…
Reference in New Issue
Block a user