pkg-config: add girdir and typelibdir variables to .pc files

We need them when building gir and typelib files for
libraries that depend on these, such as gst-rtsp-server
for example, in an uninstalled setup.

diff --git a/pkgconfig/gstreamer-app-uninstalled.pc.in b/pkgconfig/gstreamer-app-uninstalled.pc.in
index 015bedc..b989798 100644 (file)
--- a/pkgconfig/gstreamer-app-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-app-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/app
+typelibdir=@abs_top_builddir@/gst-libs/gst/app
 
 Name: GStreamer Application Library, Uninstalled
 Description: Helper functions and base classes for application integration, uninstalled

diff --git a/pkgconfig/gstreamer-app.pc.in b/pkgconfig/gstreamer-app.pc.in
index ef3d27c..8152eff 100644 (file)
--- a/pkgconfig/gstreamer-app.pc.in
+++ b/pkgconfig/gstreamer-app.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 Application Library
 Description: Helper functions and base classes for application integration

diff --git a/pkgconfig/gstreamer-audio-uninstalled.pc.in b/pkgconfig/gstreamer-audio-uninstalled.pc.in
index da927d3..ce55cf9 100644 (file)
--- a/pkgconfig/gstreamer-audio-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-audio-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/audio
+typelibdir=@abs_top_builddir@/gst-libs/gst/audio
 
 Name: GStreamer Audio Library, Uninstalled
 Description: Audio helper functions and base classes, uninstalled

diff --git a/pkgconfig/gstreamer-audio.pc.in b/pkgconfig/gstreamer-audio.pc.in
index 6236381..5743ccf 100644 (file)
--- a/pkgconfig/gstreamer-audio.pc.in
+++ b/pkgconfig/gstreamer-audio.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 Audio library
 Description: Audio helper functions and base classes

diff --git a/pkgconfig/gstreamer-cdda-uninstalled.pc.in b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
index b3fa27d..15773e8 100644 (file)
--- a/pkgconfig/gstreamer-cdda-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/cdda
+typelibdir=@abs_top_builddir@/gst-libs/gst/cdda
 
 Name: GStreamer CDDA Library, Uninstalled
 Description: CDDA base classes, uninstalled

diff --git a/pkgconfig/gstreamer-cdda.pc.in b/pkgconfig/gstreamer-cdda.pc.in
index b67eac1..86f4a2b 100644 (file)
--- a/pkgconfig/gstreamer-cdda.pc.in
+++ b/pkgconfig/gstreamer-cdda.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 CDDA Library
 Description: CDDA base classes

diff --git a/pkgconfig/gstreamer-fft-uninstalled.pc.in b/pkgconfig/gstreamer-fft-uninstalled.pc.in
index 67b0fff..163f3f0 100644 (file)
--- a/pkgconfig/gstreamer-fft-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-fft-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/fft
+typelibdir=@abs_top_builddir@/gst-libs/gst/fft
 
 Name: GStreamer FFT Library, Uninstalled
 Description: FFT implementation, uninstalled

diff --git a/pkgconfig/gstreamer-fft.pc.in b/pkgconfig/gstreamer-fft.pc.in
index 20ffdd6..5680a0c 100644 (file)
--- a/pkgconfig/gstreamer-fft.pc.in
+++ b/pkgconfig/gstreamer-fft.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 FFT Library
 Description: FFT implementation

diff --git a/pkgconfig/gstreamer-floatcast.pc.in b/pkgconfig/gstreamer-floatcast.pc.in
index 1714eaa..c54b098 100644 (file)
--- a/pkgconfig/gstreamer-floatcast.pc.in
+++ b/pkgconfig/gstreamer-floatcast.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 Floatcast Library
 Description: Platform independent floating point macros

diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 90dd740..676a23f 100644 (file)
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/interfaces
+typelibdir=@abs_top_builddir@/gst-libs/gst/interfaces
 
 Name: GStreamer Interfaces Library, Uninstalled
 Description: Interfaces for GStreamer elements, uninstalled

diff --git a/pkgconfig/gstreamer-interfaces.pc.in b/pkgconfig/gstreamer-interfaces.pc.in
index 30828e4..24749be 100644 (file)
--- a/pkgconfig/gstreamer-interfaces.pc.in
+++ b/pkgconfig/gstreamer-interfaces.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 Interfaces Library
 Description: Interfaces for GStreamer elements

diff --git a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
index ecf84d0..941c728 100644 (file)
--- a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/netbuffer
+typelibdir=@abs_top_builddir@/gst-libs/gst/netbuffer
 
 Name: GStreamer Network Buffer Library, Uninstalled
 Description: Network buffer for use in network sources/sinks, uninstalled

diff --git a/pkgconfig/gstreamer-netbuffer.pc.in b/pkgconfig/gstreamer-netbuffer.pc.in
index 44809fb..28d7ed2 100644 (file)
--- a/pkgconfig/gstreamer-netbuffer.pc.in
+++ b/pkgconfig/gstreamer-netbuffer.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 Network Buffer Library
 Description: Network buffer for use in network sources/sinks

diff --git a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
index 5725832..e08758c 100644 (file)
--- a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/pbutils
+typelibdir=@abs_top_builddir@/gst-libs/gst/pbutils
 
 Name: GStreamer Base Utils Library, Uninstalled
 Description: General utility functions, uninstalled

diff --git a/pkgconfig/gstreamer-pbutils.pc.in b/pkgconfig/gstreamer-pbutils.pc.in
index 5995424..e1626a4 100644 (file)
--- a/pkgconfig/gstreamer-pbutils.pc.in
+++ b/pkgconfig/gstreamer-pbutils.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 Utils Library
 Description: General utility functions

diff --git a/pkgconfig/gstreamer-riff-uninstalled.pc.in b/pkgconfig/gstreamer-riff-uninstalled.pc.in
index 490c0b0..2592ba1 100644 (file)
--- a/pkgconfig/gstreamer-riff-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-riff-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/riff
+typelibdir=@abs_top_builddir@/gst-libs/gst/riff
 
 Name: GStreamer RIFF Library, Uninstalled
 Description: RIFF helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-riff.pc.in b/pkgconfig/gstreamer-riff.pc.in
index 054d417..0858276 100644 (file)
--- a/pkgconfig/gstreamer-riff.pc.in
+++ b/pkgconfig/gstreamer-riff.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 RIFF Library
 Description: RIFF helper functions

diff --git a/pkgconfig/gstreamer-rtp-uninstalled.pc.in b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
index f976829..96c66cd 100644 (file)
--- a/pkgconfig/gstreamer-rtp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/rtp
+typelibdir=@abs_top_builddir@/gst-libs/gst/rtp
 
 Name: GStreamer RTP Library, Uninstalled
 Description: RTP base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-rtp.pc.in b/pkgconfig/gstreamer-rtp.pc.in
index c7a3b15..ff74a9d 100644 (file)
--- a/pkgconfig/gstreamer-rtp.pc.in
+++ b/pkgconfig/gstreamer-rtp.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 RTP Library
 Description: RTP base classes and helper functions

diff --git a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
index 3bf86b1..53258ec 100644 (file)
--- a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/rtsp
+typelibdir=@abs_top_builddir@/gst-libs/gst/rtsp
 
 Name: GStreamer RTSP Library, Uninstalled
 Description: RTSP base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-rtsp.pc.in b/pkgconfig/gstreamer-rtsp.pc.in
index b2ca7cf..203e400 100644 (file)
--- a/pkgconfig/gstreamer-rtsp.pc.in
+++ b/pkgconfig/gstreamer-rtsp.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 RTSP Library
 Description: RTSP base classes and helper functions

diff --git a/pkgconfig/gstreamer-sdp-uninstalled.pc.in b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
index d4591b5..bd1d89d 100644 (file)
--- a/pkgconfig/gstreamer-sdp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/sdp
+typelibdir=@abs_top_builddir@/gst-libs/gst/sdp
 
 Name: GStreamer SDP Library, Uninstalled
 Description: SDP helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-sdp.pc.in b/pkgconfig/gstreamer-sdp.pc.in
index bf9c56a..9bb0f40 100644 (file)
--- a/pkgconfig/gstreamer-sdp.pc.in
+++ b/pkgconfig/gstreamer-sdp.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 SDP Library
 Description: SDP helper functions

diff --git a/pkgconfig/gstreamer-tag-uninstalled.pc.in b/pkgconfig/gstreamer-tag-uninstalled.pc.in
index 5f2e791..b953a4c 100644 (file)
--- a/pkgconfig/gstreamer-tag-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-tag-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/tag
+typelibdir=@abs_top_builddir@/gst-libs/gst/tag
 
 Name: GStreamer Tag Library, Uninstalled
 Description: Tag base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-tag.pc.in b/pkgconfig/gstreamer-tag.pc.in
index 33c27b5..a7a564c 100644 (file)
--- a/pkgconfig/gstreamer-tag.pc.in
+++ b/pkgconfig/gstreamer-tag.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 Tag Library
 Description: Tag base classes and helper functions

diff --git a/pkgconfig/gstreamer-video-uninstalled.pc.in b/pkgconfig/gstreamer-video-uninstalled.pc.in
index 6379296..450be2b 100644 (file)
--- a/pkgconfig/gstreamer-video-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-video-uninstalled.pc.in
@@ -4,6 +4,8 @@ exec_prefix=
 libdir=
 # includedir is builddir because it is used to find gstconfig.h in places
 includedir=@abs_top_builddir@/gst-libs
+girdir=@abs_top_builddir@/gst-libs/gst/video
+typelibdir=@abs_top_builddir@/gst-libs/gst/video
 
 Name: GStreamer Video Library, Uninstalled
 Description: Video base classes and helper functions, uninstalled

diff --git a/pkgconfig/gstreamer-video.pc.in b/pkgconfig/gstreamer-video.pc.in
index cdddeb3..59a217d 100644 (file)
--- a/pkgconfig/gstreamer-video.pc.in
+++ b/pkgconfig/gstreamer-video.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 Video Library
 Description: Video base classes and helper functions