[gnome-documents] Install library and typelib into private pkglibdir

[Cosimo Cecchi <cosimoc src gnome org>]

commit eb874f1c12077733037e2690febc2deeda477d8d
Author: Rico Tzschichholz <ricotz t-online de>
Date:   Fri Oct 7 10:43:28 2011 +0200

    Install library and typelib into private pkglibdir
    
    Since the library isnt meant for public usage make this clear and
    move into into the package libdir and remove library version.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=661083

 src/Makefile-lib.am    |    5 ++++-
 src/Makefile.am        |   12 ++++--------
 src/gnome-documents.in |    4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index cef8f48..ff7156a 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -21,7 +21,10 @@ gdprivate_source_c = \
     lib/gd-two-lines-renderer.c \
     $(NULL)
 
-lib_LTLIBRARIES += libgdprivate-1.0.la
+privlibdir = $(pkglibdir)
+privlib_LTLIBRARIES += libgdprivate-1.0.la
+
+libgdprivate_1_0_la_LDFLAGS = -avoid-version
 
 libgdprivate_1_0_la_LIBADD = \
     $(DOCUMENTS_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5af578c..b1d8b1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,16 +8,12 @@ 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
-
 BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
-lib_LTLIBRARIES =
 INTROSPECTION_GIRS =
-gir_DATA =
 typelib_DATA =
+privlib_LTLIBRARIES =
 libexec_PROGRAMS =
 
 # convenience command for doing Makefile variable substitutions in non-Makefile
@@ -36,10 +32,10 @@ include Makefile-lib.am
 include Makefile-miner.am
 include Makefile-js.am
 
-gir_DATA += $(INTROSPECTION_GIRS)
-typelib_DATA += $(gir_DATA:.gir=.typelib)
+typelibdir = $(pkglibdir)
+typelib_DATA += $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
+CLEANFILES += $(INTROSPECTION_GIRS) $(typelib_DATA)
 
 bin_SCRIPTS = gnome-documents
 
diff --git a/src/gnome-documents.in b/src/gnome-documents.in
index 27c189d..fd9071e 100644
--- a/src/gnome-documents.in
+++ b/src/gnome-documents.in
@@ -7,9 +7,9 @@ else
 fi
 
 if test x"$GI_TYPELIB_PATH" = x ; then
-    export GI_TYPELIB_PATH= libdir@/girepository-1.0
+    export GI_TYPELIB_PATH= pkglibdir@
 else
-    export GI_TYPELIB_PATH= libdir@/girepository-1.0:$GI_TYPELIB_PATH
+    export GI_TYPELIB_PATH= pkglibdir@:$GI_TYPELIB_PATH
 fi
 
 /usr/bin/env gjs -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();"