avoid _svnmod variable

2 files changed, 8 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6c4b621f6aa..8dfac6cc1141 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sword-svn
 	pkgdesc = Libraries for Bible programs - svn-version
-	pkgver = 3581
-	pkgrel = 2
+	pkgver = 3700
+	pkgrel = 1
 	url = http://www.crosswire.org/sword/
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,6 @@ pkgbase = sword-svn
 	depends = xapian-core
 	provides = sword=1.8.1
 	conflicts = sword=1.8.1
-	options = !makeflags
 	source = sword::svn+https://www.crosswire.org/svn/sword/trunk/
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 3eb72f089676..608c55f106b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+
 pkgname=sword-svn
-pkgver=3581
-pkgrel=2
+pkgver=3700
+pkgrel=1
 pkgdesc="Libraries for Bible programs - svn-version"
 arch=('i686' 'x86_64')
 url="http://www.crosswire.org/sword/"
@@ -12,17 +13,15 @@ provides=('sword=1.8.1')
 conflicts=('sword=1.8.1')
 source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/')
 sha256sums=('SKIP')
-options=('!makeflags')
-_svnmod=sword
 
 pkgver() {
-  cd "${_svnmod}"
+  cd "${pkgname%-svn}"
   local ver="$(svnversion)"
   printf "%s" "${ver//[[:alpha:]]}"
 }
 
 build() {
-  cd "$_svnmod"  
+  cd "${pkgname%-svn}"
   ./autogen.sh
   CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
   ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc 
@@ -30,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "$_svnmod"
+  cd "${pkgname%-svn}"
   make DESTDIR="$pkgdir/" install
   make DESTDIR="$pkgdir/" install_config
 }