From dc3648cf7356346c87c0dab358ea8fdfa513aa78 Mon Sep 17 00:00:00 2001 From: Doug Newgard Date: Sun, 27 Apr 2014 22:43:48 -0500 Subject: [PATCH] Tools aren't ready to use pkgbase like this, switch back to _pkgname --- .SRCINFO | 2 +- PKGBUILD | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1a4b5cd502b7..70b137971e8e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,4 +1,4 @@ -pkgbase = e_cho +pkgbase = e_cho-git pkgdesc = Simon game based on EFL pkgver = 0.1.0alpha.r41.b668315 pkgrel = 1 diff --git a/PKGBUILD b/PKGBUILD index 54b75d6e0cca..900c26a5318c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Doug Newgard -pkgbase=e_cho -pkgname=$pkgbase-git +_pkgname=e_cho +pkgname=$_pkgname-git pkgver=0.1.0alpha.r41.b668315 pkgrel=1 pkgdesc="Simon game based on EFL" @@ -10,13 +10,13 @@ url="http://www.enlightenment.org" license=('LGPL3') depends=('elementary' 'etrophy' 'libcanberra') makedepends=('git') -provides=("$pkgbase=$pkgver") -conflicts=("$pkgbase") -source=("git://git.enlightenment.org/games/$pkgbase.git") +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +source=("git://git.enlightenment.org/games/$_pkgname.git") sha256sums=('SKIP') pkgver() { - cd "$srcdir/$pkgbase" + cd "$srcdir/$_pkgname" for _i in v_maj v_min v_mic; do local v_ver=${v_ver#.}.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") @@ -28,7 +28,7 @@ pkgver() { } build() { - cd "$srcdir/$pkgbase" + cd "$srcdir/$_pkgname" export CFLAGS="$CFLAGS -fvisibility=hidden" @@ -40,11 +40,11 @@ build() { } package() { - cd "$srcdir/$pkgbase" + cd "$srcdir/$_pkgname" make DESTDIR="$pkgdir" install # install text files - install -d "$pkgdir/usr/share/doc/$pkgbase/" - install -m644 -t "$pkgdir/usr/share/doc/$pkgbase/" AUTHORS ChangeLog NEWS README + install -d "$pkgdir/usr/share/doc/$_pkgname/" + install -m644 -t "$pkgdir/usr/share/doc/$_pkgname/" AUTHORS ChangeLog NEWS README }