.install made redundant by pacman hooks, removed.

3 files changed, 13 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f3ddeae1a92..c3fe7f5ee7c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Sun May 15 20:52:01 UTC 2016
+# Sat Aug 20 22:59:29 UTC 2016
 pkgbase = lib32-fltk
 	pkgdesc = Graphical user interface toolkit for X (32-bit)
 	pkgver = 1.3.3
 	pkgrel = 6
 	url = http://www.fltk.org
-	install = lib32-fltk.install
 	arch = x86_64
 	license = LGPL
 	makedepends = gcc-multilib
diff --git a/PKGBUILD b/PKGBUILD
index 2f5f5184a3cc..82f6b84a7be1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ url="http://www.fltk.org"
 license=('LGPL')
 depends=("${pkgname#lib32-}" 'lib32-gcc-libs' 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libpng' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft')
 makedepends=('gcc-multilib')
-install=${pkgname}.install
 source=("http://fltk.org/pub/${pkgname#lib32-}/${pkgver}/${pkgname#lib32-}-${pkgver}-source.tar.gz"
         "tigervnc.patch" "fltk-config-dynlibs.patch")
 sha512sums=('277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d'
@@ -27,11 +26,21 @@ prepare() {
 }
 
 build() {
-  export LDFLAGS+=' -m32'
+  # Modify environment to generate 32-bit ELF. Respects flags defined in makepkg.conf
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export LDFLAGS="-m32 ${LDFLAGS}"
   export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
 
   cd "${pkgname#lib32-}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32/fltk --enable-threads --enable-xft --enable-shared CC='gcc -m32' CXX='g++ -m32'
+  ./configure \
+    --build=i686-pc-linux-gnu \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --libexecdir=/usr/lib32/fltk \
+    --enable-threads \
+    --enable-xft \
+    --enable-shared
   make
 }
 
diff --git a/lib32-fltk.install b/lib32-fltk.install
deleted file mode 100644
index 802b96b1a5a5..000000000000
--- a/lib32-fltk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}
\ No newline at end of file