Code tightening.

2 files changed, 7 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bff04e5711f..874f1eb881aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-fltk
 	pkgdesc = Graphical user interface toolkit for X (32-bit)
 	pkgver = 1.3.3
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.fltk.org
 	install = lib32-fltk.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 805949fb09aa..89dbd55f3862 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,23 @@
 # Contributor: xw258
 # Contributor: genesis66
 
-_pkgbase=fltk
-pkgname=lib32-${_pkgbase}
+pkgname=lib32-fltk
 pkgver=1.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Graphical user interface toolkit for X (32-bit)"
 arch=('x86_64')
 url="http://www.fltk.org"
 license=('LGPL')
 depends=('fltk' 'lib32-gcc-libs' 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libpng' 'lib32-libxft' 'lib32-libxinerama' 'lib32-libxcursor')
 install=${pkgname}.install
-source=("http://fltk.org/pub/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}-source.tar.gz"
+source=("http://fltk.org/pub/${pkgname#lib32-}/${pkgver}/${pkgname#lib32-}-${pkgver}-source.tar.gz"
         "tigervnc.patch" "fltk-config-dynlibs.patch")
 sha512sums=('277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d'
             '30fd8ad3cbedc7e4cb0b3e08d21cc28aa9c8f20d4d1970646de931243c3752f55c4414d921aec29dbdf3b1e4eade0365d3c806fb5c9ecaa29ac3d7cf01f216be'
             '33743f009c4486cc2199dc90b031cfe977c779f6bf6e958de29a2180578f3866004f20f6411a049aa1192ea4f8adad4636cd90cb4f0ff6ae05205bd2bc016fef')
 
 prepare() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
   export LDFLAGS='-m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
   patch -p1 -i ../../tigervnc.patch
@@ -28,14 +27,14 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
   sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32/fltk --enable-threads --enable-xft --enable-shared CC='gcc -m32' CXX='g++ -m32'
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C fluid install install-linux
   chmod 644 "${pkgdir}"/usr/lib32/*.a