[sushi] build: move libsushi out of $libdir

[Cosimo Cecchi <cosimoc src gnome org>]

commit fcba8081fd41bee11c4e967301e38f312bcc00e2
Author: Michael Biebl <biebl debian org>
Date:   Sun Apr 1 03:53:17 2012 +0200

    build: move libsushi out of $libdir
    
    Don't install our private introspected library in the system libdir,
    since it's not supposed to be used outside of sushi.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673269

 src/Makefile-sushi.am |    5 ++++-
 src/Makefile.am       |    6 +++---
 src/sushi.in          |   10 ++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile-sushi.am b/src/Makefile-sushi.am
index feca2db..bb311a5 100644
--- a/src/Makefile-sushi.am
+++ b/src/Makefile-sushi.am
@@ -53,11 +53,14 @@ sushi-enum-types.c: stamp-sushi-enum-types.h libsushi/sushi-enum-types.c.in
 	cp xgen-betc sushi-enum-types.c && \
 	rm -f xgen-betc
 
-lib_LTLIBRARIES += libsushi-1.0.la
+pkglib_LTLIBRARIES += libsushi-1.0.la
 
 libsushi_1_0_la_LIBADD = \
     $(SUSHI_LIBS)
 
+libsushi_1_0_la_LDFLAGS = \
+    -avoid-version
+
 libsushi_1_0_la_CPPFLAGS = \
     $(sushi_cflags)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3683789..3188a60 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,13 +8,13 @@ AM_CPPFLAGS = \
     -DSUSHI_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
     -DSUSHI_BUILDDIR=\"$(abs_top_builddir)\"
 
-girdir = $(datadir)/gir-1.0
-typelibdir = $(libdir)/girepository-1.0
+girdir = $(pkgdatadir)/gir-1.0
+typelibdir = $(pkglibdir)/girepository-1.0
 
 BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
-lib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
 INTROSPECTION_GIRS =
 gir_DATA =
 typelib_DATA =
diff --git a/src/sushi.in b/src/sushi.in
index 1138f54..b9faad0 100644
--- a/src/sushi.in
+++ b/src/sushi.in
@@ -7,9 +7,15 @@ else
 fi
 
 if test x"$GI_TYPELIB_PATH" = x ; then
-    export GI_TYPELIB_PATH= libdir@/girepository-1.0
+    export GI_TYPELIB_PATH= pkglibdir@/girepository-1.0
 else
-    export GI_TYPELIB_PATH= libdir@/girepository-1.0:$GI_TYPELIB_PATH
+    export GI_TYPELIB_PATH= pkglibdir@/girepository-1.0:$GI_TYPELIB_PATH
+fi
+
+if test x"$LD_LIBRARY_PATH" = x ; then
+    export LD_LIBRARY_PATH= pkglibdir@
+else
+    export LD_LIBRARY_PATH= pkglibdir@:$LD_LIBRARY_PATH
 fi
 
 if test x"$GJS_DEBUG_OUTPUT" = x ; then