diff options
| author |   Erik Hanson | 2010-12-30 22:49:18 +0100 |
|---|---|---|
| committer |   Robby Workman | 2011-01-01 01:59:33 +0100 |
| commit | b1eb7646843d89fe09fca6969a6056193594aa5e (patch) | |
| tree | f400e7ea8f2b9bf4aed5b5b812d66e9d4c65468b | |
| parent | e46843d119a5fff3a0e488d7069c996d825f3586 (diff) | |
| download | slackbuilds-b1eb7646843d89fe09fca6969a6056193594aa5e.tar.gz | |
libraries/json-glib: Fixed a hardcoded library path.
Thanks to John Tyree.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
| -rw-r--r-- | libraries/json-glib/fix_hardcoded_pkgconfig.diff | 13 | ||||
| -rw-r--r-- | libraries/json-glib/json-glib.SlackBuild | 8 |
2 files changed, 16 insertions, 5 deletions
diff --git a/libraries/json-glib/fix_hardcoded_pkgconfig.diff b/libraries/json-glib/fix_hardcoded_pkgconfig.diff new file mode 100644 index 0000000000..02374e32ca --- /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 ac13243e8d..14bf3c3c04 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 |