[gnome-documents] build: move libgdprivate out of $libdir

[Cosimo Cecchi <cosimoc src gnome org>]

commit a04a1eee491d7f0df83abfb00e610340b5fe1f19
Author: Michael Biebl <biebl debian org>
Date:   Tue Dec 20 10:29:19 2011 +0100

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

 src/Makefile-lib.am    |    5 ++++-
 src/Makefile.am        |    6 +++---
 src/gnome-documents.in |   10 ++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index 15b9fa8..0e8463b 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -35,12 +35,15 @@ gdprivate_source_c = \
     lib/gd-two-lines-renderer.c \
     $(NULL)
 
-lib_LTLIBRARIES += libgdprivate-1.0.la
+pkglib_LTLIBRARIES += libgdprivate-1.0.la
 
 libgdprivate_1_0_la_LIBADD = \
     $(DOCUMENTS_LIBS) \
     $(LIBM)
 
+libgdprivate_1_0_la_LDFLAGS = \
+    -avoid-version
+
 libgdprivate_1_0_la_CPPFLAGS = \
     $(gdprivate_cflags)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 75c2d0a..31078dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,13 +8,13 @@ AM_CPPFLAGS = \
     -DGNOME_DOCUMENTS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
     -DGNOME_DOCUMENTS_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/gnome-documents.in b/src/gnome-documents.in
index 48a3d7b..79df19a 100644
--- a/src/gnome-documents.in
+++ b/src/gnome-documents.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
 
 @GJS_CONSOLE@ -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();" "$@"