From 91922d68b35cc4e85b24935290d49a48dc9c638d Mon Sep 17 00:00:00 2001
From: Justin Davis <jrcd83@gmail.com>
Date: Wed, 6 Jun 2012 12:59:42 -0400
Subject: Module::Build dists were totally borked.

---
 preps/perl.d/perl-dist     | 5 +++--
 preps/perl.d/perl-pkgbuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'preps')

diff --git a/preps/perl.d/perl-dist b/preps/perl.d/perl-dist
index fd5c216..4431f77 100755
--- a/preps/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -371,6 +371,8 @@ sub printdata
 sub writepb
 {
 	my($ddir) = @_;
+
+	print STDERR "DBG: \$ddir = {$ddir}\n";
 	my $dtype = (-f "$ddir/Build.PL" ? "MB" : "MM");
 	if(system $PBPROG => $dtype){
 		return $? >> 8;
@@ -408,8 +410,7 @@ sub main
 	);
 
 	chdir $dir or die "chdir: $!";
-
-	my $ret = writepb($dir);
+	my $ret = writepb("$dir/src/$distdir");
 	if($ret){
 		print STDERR "$PROG: failed to write PKGBUILD: error $ret\n";
 		return 1;
diff --git a/preps/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild
index f1e9663..47a39ea 100755
--- a/preps/perl.d/perl-pkgbuild
+++ b/preps/perl.d/perl-pkgbuild
@@ -65,7 +65,8 @@ sub main
 		$script = 'Build.PL';
 		$make = './Build';
 		$iargs = q{installdirs=vendor destdir="$pkgdir"};
-		push @badenv, 'PERL_MB_OPT', 'MODULEBUILDRC=/dev/null';
+		push @exports, 'MODULEBUILDRC=/dev/null';
+		push @badenv, 'PERL_MB_OPT';
 	}
 
 	my %funcs;
@@ -74,7 +75,7 @@ sub main
 		$funcs{$f}{'beg'} = startfunc($f);
 		# Module::Build uses env vars for each stage of Build
 		if($type eq 'MB'){
-			$funcs{$f}{'beg'} = <<"ENDTXT";
+			$funcs{$f}{'beg'} .= functxt(<<"ENDTXT");
 export @exports
 unset @badenv
 ENDTXT
-- 
cgit v1.2.3-24-g4f1b