summaryrefslogtreecommitdiffstats
path: root/preps
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2013-04-11 13:33:35 +0200
committerJustin Davis <jrcd83@gmail.com>2013-04-11 13:33:35 +0200
commitea8184012874f11d4ef9eed6e7fcc8cd5a1bf848 (patch)
treed708ecf730aac31a5941f9c3889107b2ae1278ae /preps
parent418be7247234652f2a09cf20cbbb892edceed49c (diff)
downloadgenpkg-ea8184012874f11d4ef9eed6e7fcc8cd5a1bf848.tar.gz
genpkg-ea8184012874f11d4ef9eed6e7fcc8cd5a1bf848.tar.xz
Perl mod pkgbuilds use $_ddir now.
With pacman 4.1 $srcdir is no longer set outside of PKGBUILD functions. Yipee! This breaks all of my PKGBUILDs. Now we switch to storing the distribution's tarballed directory in the _ddir custom variable. We cd into $srcdir/$_ddir at the beginning of every func. Custom variable mechanics have changed in bin/pbfields as well. Instead of hard-coding _dir as an accepted field, any PKGDATA entry with a name starting with underscore (_) is considered a custom variable and printed in the PKGBUILD.
Diffstat (limited to 'preps')
-rwxr-xr-xpreps/perl.d/perl-dist2
-rwxr-xr-xpreps/perl.d/perl-pkgbuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/preps/perl.d/perl-dist b/preps/perl.d/perl-dist
index c6fa2e3..0310fa4 100755
--- a/preps/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -402,7 +402,7 @@ sub main
'pkgver' => $ver,
'pkgdesc' => $meta->{'abstract'},
'arch' => (xsdist($distdir) ? ['i686', 'x86_64'] : 'any'),
- 'dir' => "\$srcdir/$distdir",
+ '_ddir' => $distdir,
%$deps,
);
diff --git a/preps/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild
index 47a39ea..3708bc5 100755
--- a/preps/perl.d/perl-pkgbuild
+++ b/preps/perl.d/perl-pkgbuild
@@ -31,7 +31,7 @@ sub startfunc
return <<"ENDTXT";
${name}()
(
- cd "\$_dir"
+ cd "\$srcdir/\$_ddir"
ENDTXT
}