pkgconfig: add girdir and typelibdir variables to .pc files

So that the -base libs can figure out the right include paths for the
gobject-introspection tools even if core got installed into a prefix
that's not the same prefix as gobject-introspection is installed in
or it's being build in an uninstalled gstreamer setup.

diff --git a/pkgconfig/gstreamer-base-uninstalled.pc.in b/pkgconfig/gstreamer-base-uninstalled.pc.in
index 2853c25..cec396c 100644 (file)
--- a/pkgconfig/gstreamer-base-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-base-uninstalled.pc.in
@@ -3,6 +3,8 @@ prefix=
 exec_prefix=
 libdir=
 includedir=
+girdir=@abs_top_builddir@/libs/gst/base
+typelibdir=@abs_top_builddir@/libs/gst/base
 
 Name: GStreamer base classes, uninstalled
 Description: Base classes for GStreamer elements, Not Installed

diff --git a/pkgconfig/gstreamer-base.pc.in b/pkgconfig/gstreamer-base.pc.in
index 2b8aaf4..45471a8 100644 (file)
--- a/pkgconfig/gstreamer-base.pc.in
+++ b/pkgconfig/gstreamer-base.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer base classes
 Description: Base classes for GStreamer elements

diff --git a/pkgconfig/gstreamer-check-uninstalled.pc.in b/pkgconfig/gstreamer-check-uninstalled.pc.in
index efdc396..d98d97a 100644 (file)
--- a/pkgconfig/gstreamer-check-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-check-uninstalled.pc.in
@@ -3,6 +3,8 @@ prefix=
 exec_prefix=
 libdir=
 includedir=
+girdir=@abs_top_builddir@/libs/gst/check
+typelibdir=@abs_top_builddir@/libs/gst/check
 
 Name: GStreamer check unit testing, uninstalled
 Description: Unit testing helper library for GStreamer modules, Not Installed

diff --git a/pkgconfig/gstreamer-check.pc.in b/pkgconfig/gstreamer-check.pc.in
index f730d10..ac2a2c1 100644 (file)
--- a/pkgconfig/gstreamer-check.pc.in
+++ b/pkgconfig/gstreamer-check.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer check unit testing
 Description: Unit testing helper library for GStreamer modules

diff --git a/pkgconfig/gstreamer-controller-uninstalled.pc.in b/pkgconfig/gstreamer-controller-uninstalled.pc.in
index cbd9acd..8c60b61 100644 (file)
--- a/pkgconfig/gstreamer-controller-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-controller-uninstalled.pc.in
@@ -3,6 +3,8 @@ prefix=
 exec_prefix=
 libdir=
 includedir=
+girdir=@abs_top_builddir@/libs/gst/controller
+typelibdir=@abs_top_builddir@/libs/gst/controller
 
 Name: GStreamer controller, uninstalled
 Description: Dynamic parameter control for GStreamer elements, Not Installed

diff --git a/pkgconfig/gstreamer-controller.pc.in b/pkgconfig/gstreamer-controller.pc.in
index 33fbbce..8d197ab 100644 (file)
--- a/pkgconfig/gstreamer-controller.pc.in
+++ b/pkgconfig/gstreamer-controller.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer controller
 Description: Dynamic parameter control for GStreamer elements

diff --git a/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in
index 8649260..9e8536c 100644 (file)
--- a/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in
@@ -3,6 +3,8 @@ prefix=
 exec_prefix=
 libdir=
 includedir=
+girdir=@abs_top_builddir@/libs/gst/dataprotocol
+typelibdir=@abs_top_builddir@/libs/gst/dataprotocol
 
 Name: GStreamer data protocol library, uninstalled
 Description: Data protocol for plug-ins, Not Installed

diff --git a/pkgconfig/gstreamer-dataprotocol.pc.in b/pkgconfig/gstreamer-dataprotocol.pc.in
index edfc5bb..e06b7e9 100644 (file)
--- a/pkgconfig/gstreamer-dataprotocol.pc.in
+++ b/pkgconfig/gstreamer-dataprotocol.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer data protocol library
 Description: Data protocol for plug-ins

diff --git a/pkgconfig/gstreamer-net-uninstalled.pc.in b/pkgconfig/gstreamer-net-uninstalled.pc.in
index b69d91e..18cf44f 100644 (file)
--- a/pkgconfig/gstreamer-net-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-net-uninstalled.pc.in
@@ -3,6 +3,8 @@ prefix=
 exec_prefix=
 libdir=
 includedir=
+girdir=@abs_top_builddir@/libs/gst/net
+typelibdir=@abs_top_builddir@/libs/gst/net
 
 Name: GStreamer networking library, uninstalled
 Description: Network-enabled GStreamer plug-ins and clocking, uninstalled

diff --git a/pkgconfig/gstreamer-net.pc.in b/pkgconfig/gstreamer-net.pc.in
index 4594d11..d8b510b 100644 (file)
--- a/pkgconfig/gstreamer-net.pc.in
+++ b/pkgconfig/gstreamer-net.pc.in
@@ -2,6 +2,10 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer networking library
 Description: Network-enabled GStreamer plug-ins and clocking

diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in
index 7e8ce43..70332ef 100644 (file)
--- a/pkgconfig/gstreamer-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-uninstalled.pc.in
@@ -6,6 +6,8 @@ libdir=
 includedir=@abs_top_builddir@
 toolsdir=@abs_top_builddir@/tools
 pluginsdir=@abs_top_builddir@
+girdir=@abs_top_builddir@/gst
+typelibdir=@abs_top_builddir@/gst
 
 Name: GStreamer Uninstalled
 Description: Streaming media framework, Not Installed

diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in
index 32fd811..ad4554d 100644 (file)
--- a/pkgconfig/gstreamer.pc.in
+++ b/pkgconfig/gstreamer.pc.in
@@ -4,6 +4,10 @@ libdir=@libdir@
 includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
 toolsdir=${exec_prefix}/bin
 pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+girdir=${datadir}/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer
 Description: Streaming media framework