From b1eb7646843d89fe09fca6969a6056193594aa5e Mon Sep 17 00:00:00 2001
From: Erik Hanson <erik@slackbuilds.org>
Date: Thu, 30 Dec 2010 15:49:18 -0600
Subject: libraries/json-glib: Fixed a hardcoded library path.

  Thanks to John Tyree.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
---
 libraries/json-glib/fix_hardcoded_pkgconfig.diff | 13 +++++++++++++
 libraries/json-glib/json-glib.SlackBuild         |  8 +++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 libraries/json-glib/fix_hardcoded_pkgconfig.diff

(limited to 'libraries')

diff --git a/libraries/json-glib/fix_hardcoded_pkgconfig.diff b/libraries/json-glib/fix_hardcoded_pkgconfig.diff
new file mode 100644
index 0000000000000..02374e32cac95
--- /dev/null
+++ b/libraries/json-glib/fix_hardcoded_pkgconfig.diff
@@ -0,0 +1,13 @@
+--- json-glib.pc.in.orig    2009-06-24 08:06:20.000000000 -0400
++++ json-glib.pc.in    2010-12-27 11:26:49.111354950 -0400
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${exec_prefix}/include
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+
+ Name: JSON-GLib
+ Description: JSON Parser for GLib
diff --git a/libraries/json-glib/json-glib.SlackBuild b/libraries/json-glib/json-glib.SlackBuild
index ac13243e8dc4e..14bf3c3c04edd 100644
--- a/libraries/json-glib/json-glib.SlackBuild
+++ b/libraries/json-glib/json-glib.SlackBuild
@@ -65,6 +65,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Fix the hard-coded pkgconfig file:
+patch -p0 < $CWD/fix_hardcoded_pkgconfig.diff
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -78,11 +81,6 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-# Fix the hard-coded pkgconfig file:
-if [ "$ARCH" = "x86_64" ]; then
-  sed -i "s#/lib#/lib64#" $PKG/usr/lib64/pkgconfig/json-glib-1.0.pc
-fi
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
       $PKG/usr/doc/$PRGNAM-$VERSION
-- 
cgit v1.2.3