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

[Cosimo Cecchi <cosimoc src gnome org>]

commit a3e33feefccd121ace7c9153c65f763f7c62a8fc
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Oct 13 10:41:20 2011 -0400

    Revert "Install library and typelib into private pkglibdir"
    
    This reverts commit eb874f1c12077733037e2690febc2deeda477d8d.

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