diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2011-09-25 08:26:29 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2011-09-25 08:26:29 +0000 |
| commit | 44d727cc4b00b1af0354b0ec26814cb3958d005c (patch) | |
| tree | 1288f57c343bf635c9820178046a5dca73214c30 /usr.sbin/pkg_add | |
| parent | 68ae72f2107e0f4f080db40dcf17a1a4b8c5ba10 (diff) | |
remove hack, ask for SUBDIRs with FULLPATH set
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 3a3dd0f9a66..288a23fa634 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCreate.pm,v 1.48 2011/09/17 09:49:55 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.49 2011/09/25 08:26:28 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -640,11 +640,8 @@ sub ask_tree if ($pid == 0) { chdir $portsdir or exit 2; open STDERR, '>', '/dev/null'; - my ($dir, @parts) = split(/\,/, $dep->{pkgpath}); - if (@parts == 0 || @parts == 1 && $parts[0] =~ m/^\-/) { - unshift(@parts, ''); - } - $ENV{SUBDIR} = join(',', $dir, @parts); + $ENV{FULLPATH} = 'Yes'; + $ENV{SUBDIR} = $dep->{pkgpath}; $ENV{ECHO_MSG} = ':'; exec $make ('make', @action); } |