[arch-commits] Commit in antiword/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Allan McRae]

    Date: Monday, June 22, 2009 @ 08:04:06
  Author: allan
Revision: 43330

fix svn conflict

Modified:
  antiword/repos/extra-x86_64/	(properties)
  antiword/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


Property changes on: antiword/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /antiword/trunk:1
   + /antiword/trunk:1-43329

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-22 12:01:16 UTC (rev 43329)
+++ extra-x86_64/PKGBUILD	2009-06-22 12:04:06 UTC (rev 43330)
@@ -3,9 +3,9 @@
 
 pkgname=antiword
 pkgver=0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Antiword is a free MS Word reader for Linux and RISC OS"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.winfield.demon.nl/"
 license="GPL"
 depends=('glibc')
@@ -16,10 +16,11 @@
 
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   sed -i "s|CFLAGS	=.*|CFLAGS = $CFLAGS -DNDEBUG|g; \
           s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \
           Makefile.Linux
-  make DESTDIR=$startdir/pkg global_install
-  install -m755 $startdir/src/antiword-helper $startdir/pkg/usr/bin/
+  make DESTDIR=$pkgdir global_install
+  install -m755 $srcdir/antiword-helper $pkgdir/usr/bin/
+  install -Dm644 Docs/antiword.1 $pkgdir/usr/share/man/man1/antiword.1
 }