[arch-commits] Commit in gtk1-engines/repos (extra-i686 extra-i686/PKGBUILD)

[Thayer Williams]

    Date: Friday, November 14, 2008 @ 18:05:36
  Author: thayer
Revision: 19117

Merged revisions 19029,19116 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/gtk1-engines/trunk

........
  r19029 | eric | 2008-11-14 00:02:55 -0800 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: gtk1-engines 0.12-2
      updated x86_64 build fix
........
  r19116 | thayer | 2008-11-14 15:04:37 -0800 (Fri, 14 Nov 2008) | 1 line
  
  pkgbuild cleanup
........

Modified:
  gtk1-engines/repos/extra-i686/	(properties)
  gtk1-engines/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)


Property changes on: gtk1-engines/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gtk1-engines/trunk:1-19007
   + /gtk1-engines/trunk:1-19116

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-14 23:04:37 UTC (rev 19116)
+++ extra-i686/PKGBUILD	2008-11-14 23:05:36 UTC (rev 19117)
@@ -15,24 +15,20 @@
 md5sums=('c867d1ebd6dbea355765d689a11330ec')
 
 build() {
-  cd $startdir/src/gtk-engines-$pkgver
+  cd $srcdir/gtk-engines-$pkgver
 
   # arch64 fix from fedora
+  if [ "$CARCH" == "x86_64" ]; then
+    sed -i -e 's/AM_PROG_LIBTOOL/AC_PROG_LIBTOOL/' configure.in
+    rm -f acinclude.m4
+    autoreconf -f -i
+  fi
 
-if [ "$CARCH" == "x86_64" ]; then
-  rm acinclude.m4
-  touch depcomp
-  libtoolize --force --copy
-  aclocal
-  automake
-  autoconf
-fi
-
   ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
 
-  # removes files that are already provided by gtk-engines (for gtk2)
-  rm $startdir/pkg/usr/share/themes/Metal/README.html
-  rm $startdir/pkg/usr/share/themes/Redmond95/README.html
+  # these files are already provided by gtk-engines
+  rm $pkgdir/usr/share/themes/Metal/README.html
+  rm $pkgdir/usr/share/themes/Redmond95/README.html
 }