[arch-commits] Commit in db4/trunk (PKGBUILD)

[Allan McRae]

    Date: Friday, April 9, 2010 @ 02:18:06
  Author: allan
Revision: 76927

fix conflicts with db

Modified:
  db4/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-09 06:12:05 UTC (rev 76926)
+++ PKGBUILD	2010-04-09 06:18:06 UTC (rev 76927)
@@ -16,16 +16,23 @@
 md5sums=('3476bac9ec0f3c40729c8a404151d5e3')
 
 build() {
-  cd ${srcdir}/$pkgname-${_basever}/build_unix
+  cd ${srcdir}/db-${_basever}/build_unix
   ../dist/configure --prefix=/usr --enable-compat185 \
     --enable-shared --enable-static --enable-cxx
   make LIBSO_LIBS=-lpthread || return 1
 }
 
 package() {
-  cd ${srcdir}/$pkgname-${_basever}/build_unix
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/db-${_basever}/build_unix
+  make DESTDIR=${pkgdir} includedir=${pkgdir}/usr/include/db4 install
   rm -rf ${pkgdir}/usr/docs
-  install -Dm644 ${srcdir}/${pkgname}-${_basever}/LICENSE \
+  
+  rm -f ${pkgdir}/usr/lib/libdb{,_cxx}.{so,a}
+  cd "${pkgdir}/usr/bin"
+  for i in *; do
+    mv ${i} db4_${i/db_/} || return 1
+  done
+  
+  install -Dm644 ${srcdir}/db-${_basever}/LICENSE \
     ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }