summaryrefslogtreecommitdiff
path: root/extra/glib
diff options
context:
space:
mode:
Diffstat (limited to 'extra/glib')
-rw-r--r--extra/glib/PKGBUILD34
-rw-r--r--extra/glib/glib.install2
2 files changed, 21 insertions, 15 deletions
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index 48945164c..480a521e2 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD 55861 2009-10-15 02:42:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $
+# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=glib
pkgver=1.2.10
-pkgrel=8.1
+pkgrel=9
pkgdesc="Common C routines used by Gtk+ and other libs"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
license=('LGPL')
-depends=('glibc' 'texinfo')
+depends=('glibc')
options=('!libtool')
install=glib.install
source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\
+md5sums=('6fe30dad87c77b91b632def29dd69ef9'
+ '877b3330e822a4be69a0f8a8c268cfd7'
'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\
- 'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
+ 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
+ 'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../gcc340.patch || return 1
- patch -Np0 -i ../aclocal-fixes.patch || return 1
+ patch -Np1 -i ../gcc340.patch
+ patch -Np0 -i ../aclocal-fixes.patch
- [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu"
- ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $CONFIGFLAG || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info $CONFIGFLAG
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/glib/glib.install b/extra/glib/glib.install
index 140fd2fe9..c0046feba 100644
--- a/extra/glib/glib.install
+++ b/extra/glib/glib.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
filelist=(glib.info.gz)
post_install() {