Set the pkgname in pbj to match the .pbj filename.

2 files changed, 4 insertions, 4 deletions

diff --git a/bin/macros/perl-dist b/bin/macros/perl-dist
index 3dd2263..09381ff 100755
--- a/bin/macros/perl-dist
+++ b/bin/macros/perl-dist
@@ -347,8 +347,7 @@ sub main
     my $deps = Convert::prereqs($name, $meta->{'prereqs'});
 
     my %pbvars =
-        ('pkgname' => $name,
-         'pkgver'  => $ver,
+        ('pkgver'  => $ver,
          'pkgdesc' => $meta->{'abstract'},
 
          'arch'       => (xsdist($dir) ? ['i686', 'x86_64'] : 'any'),
diff --git a/bin/pbj b/bin/pbj
index ac926b6..0ca06f8 100755
--- a/bin/pbj
+++ b/bin/pbj
@@ -43,8 +43,9 @@ cd "$pkgroot/$pkg"
 
 export PATH="$PATH:$bindir/macros:$bindir/templ"
 
-# Provide values for things macros won't be able to.
-printf "+ pbjver $VERSION\n+ pkgrel ${PKGREL:-1}\n" \
+# Match the pkgname to the .pbj filename.
+# Provide values for other things macros won't be able to.
+printf "+ pkgname $pkg\n+ pkgrel ${PKGREL:-1}\n+ pbjver $VERSION\n" \
     | cat - "$jamfile" \
     | awk -v packager="$PACKAGER" -f "$bindir/pbjparse.awk" \
     > PKGBUILD