--- PKGBUILD.old        2007-05-24 22:39:55.000000000 +0100
+++ PKGBUILD    2007-05-24 22:38:23.000000000 +0100
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=gnupg2
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
 arch=(i686 x86_64)
 depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt' 'pth' 'libusb' 'libassuan' 'pinentry' 'dirmngr')
@@ -16,11 +16,10 @@
   # O2 breaks it on x86_64
   [ "$CARCH" = "x86_64" ] && EXTRAOPTS="--disable-optimization"

-  ./configure --prefix=/usr $EXTRAOPTS
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 $EXTRAOPTS
   make || return 1
   make DESTDIR=$startdir/pkg install
   # move conflicting files
-  mkdir $startdir/pkg/usr/share/gnupg2
-  mv $startdir/pkg/usr/share/gnupg/* $startdir/pkg/usr/share/gnupg2
+  mv $startdir/pkg/usr/share/gnupg{,2}
 }
 md5sums=('e16efce067ba132f933792a3ec7f180e')