16 files changed, 93 insertions, 77 deletions
diff --git a/pkgconfig/gstreamer-app-uninstalled.pc.in b/pkgconfig/gstreamer-app-uninstalled.pc.in
index 20b52f5e1..015bedcd8 100644
--- a/pkgconfig/gstreamer-app-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-app-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/app
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Application Library, Uninstalled
 Description: Helper functions and base classes for application integration, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstapp-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-audio-uninstalled.pc.in b/pkgconfig/gstreamer-audio-uninstalled.pc.in
index 429e71368..da927d3fe 100644
--- a/pkgconfig/gstreamer-audio-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-audio-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/audio
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Audio Library, Uninstalled
 Description: Audio helper functions and base classes, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-interfaces-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstaudio-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-cdda-uninstalled.pc.in b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
index 481dd77a7..b3fa27d00 100644
--- a/pkgconfig/gstreamer-cdda-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-cdda-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/cdda
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer CDDA Library, Uninstalled
 Description: CDDA base classes, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-tag-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstcdda-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-fft-uninstalled.pc.in b/pkgconfig/gstreamer-fft-uninstalled.pc.in
index 6a3e8d54c..2d78e7338 100644
--- a/pkgconfig/gstreamer-fft-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-fft-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/fft
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer FFT Library, Uninstalled
 Description: FFT implementation, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstfft-@GST_MAJORMINOR@.la -lm
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-floatcast-uninstalled.pc.in b/pkgconfig/gstreamer-floatcast-uninstalled.pc.in
index 0653ade63..a8eacf7fc 100644
--- a/pkgconfig/gstreamer-floatcast-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-floatcast-uninstalled.pc.in
@@ -1,12 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/floatcast
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Floatcast Library, Uninstalled
 Description: Platform independent floating point macros, uninstalled
 Version: @VERSION@
 Requires: glib-2.0
-Libs: -lm
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @LIBM@
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-floatcast.pc.in b/pkgconfig/gstreamer-floatcast.pc.in
index 3ca7ec31b..1714eaafa 100644
--- a/pkgconfig/gstreamer-floatcast.pc.in
+++ b/pkgconfig/gstreamer-floatcast.pc.in
@@ -7,6 +7,6 @@ Name: GStreamer Floatcast Library
 Description: Platform independent floating point macros
 Requires: glib-2.0
 Version: @VERSION@
+Libs: @LIBM@
 Cflags: -I${includedir}
-Libs: -lm
 
diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 77d2d7dbc..90dd7405a 100644
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/interfaces
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Interfaces Library, Uninstalled
 Description: Interfaces for GStreamer elements, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstinterfaces-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
index f18f47fb1..ecf84d026 100644
--- a/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/netbuffer
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Network Buffer Library, Uninstalled
 Description: Network buffer for use in network sources/sinks, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstnetbuffer-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
index 4dc2f2ccd..57258328a 100644
--- a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/pbutils
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Base Utils Library, Uninstalled
 Description: General utility functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstpbutils-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
index f87345a18..8a9bea217 100644
--- a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
@@ -1,15 +1,16 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
-includedir=${pcfiledir}/../gst-libs
-pluginsdir=${pcfiledir}/..
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
+pluginsdir=@abs_top_builddir@
 
 Name: GStreamer Base Plugins Libraries, Uninstalled
 Description: Streaming media framework, base plugins libraries, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
+Libs: -L@abs_top_builddir@/gst-libs/gst/audio -L@abs_top_builddir@/gst-libs/gst/cdda -L@abs_top_builddir@/gst-libs/gst/fft -L@abs_top_builddir@/gst-libs/gst/floatcast -L@abs_top_builddir@/gst-libs/gst/interfaces -L@abs_top_builddir@/gst-libs/gst/netbuffer -L@abs_top_builddir@/gst-libs/gst/riff -L@abs_top_builddir@/gst-libs/gst/rtp -L@abs_top_builddir@/gst-libs/gst/rtsp -L@abs_top_builddir@/gst-libs/gst/sdp -L@abs_top_builddir@/gst-libs/gst/tag -L@abs_top_builddir@/gst-libs/gst/pbutils -L@abs_top_builddir@/gst-libs/gst/video -L@abs_top_builddir@/gst-libs/gst/app
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
-Libs: -L${libdir}/audio -L${libdir}/cdda -L${libdir}/fft -L${libdir}/floatcast -L${libdir}/interfaces -L${libdir}/netbuffer -L${libdir}/riff -L${libdir}/rtp -L${libdir}/rtsp -L${libdir}/sdp -L${libdir}/tag -L${libdir}/pbutils -L${libdir}/video -L${libdir}/app
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
-
-libraries=audio cdda fft floatcast interfaces netbuffer riff tag pbutils video
+libraries=app audio cdda fft floatcast interfaces netbuffer riff rtp rtsp sdp tag pbutils video
diff --git a/pkgconfig/gstreamer-riff-uninstalled.pc.in b/pkgconfig/gstreamer-riff-uninstalled.pc.in
index 61c1a41e5..490c0b02e 100644
--- a/pkgconfig/gstreamer-riff-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-riff-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/riff
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer RIFF Library, Uninstalled
 Description: RIFF helper functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstriff-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-rtp-uninstalled.pc.in b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
index a427d81f1..f976829b8 100644
--- a/pkgconfig/gstreamer-rtp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtp-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/rtp
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer RTP Library, Uninstalled
 Description: RTP base classes and helper functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstrtp-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
index aa66ee1c3..3bf86b171 100644
--- a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/rtsp
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer RTSP Library, Uninstalled
 Description: RTSP base classes and helper functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-sdp-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstrtsp-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-sdp-uninstalled.pc.in b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
index 7fe333632..d4591b583 100644
--- a/pkgconfig/gstreamer-sdp-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-sdp-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/sdp
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer SDP Library, Uninstalled
 Description: SDP helper functions, uninstalled
 Version: @VERSION@
 Requires: glib-2.0
-
-Libs: -L${libdir} ${libdir}/libgstsdp-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/sdp/libgstsdp-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-tag-uninstalled.pc.in b/pkgconfig/gstreamer-tag-uninstalled.pc.in
index 8b7df368a..5f2e79115 100644
--- a/pkgconfig/gstreamer-tag-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-tag-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/tag
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Tag Library, Uninstalled
 Description: Tag base classes and helper functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgsttag-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
 
diff --git a/pkgconfig/gstreamer-video-uninstalled.pc.in b/pkgconfig/gstreamer-video-uninstalled.pc.in
index 00abf1745..63792967b 100644
--- a/pkgconfig/gstreamer-video-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-video-uninstalled.pc.in
@@ -1,13 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/video
-includedir=${pcfiledir}/../gst-libs
+libdir=
+# includedir is builddir because it is used to find gstconfig.h in places
+includedir=@abs_top_builddir@/gst-libs
 
 Name: GStreamer Video Library, Uninstalled
 Description: Video base classes and helper functions, uninstalled
 Version: @VERSION@
 Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
-
-Libs: -L${libdir} ${libdir}/libgstvideo-@GST_MAJORMINOR@.la
-Cflags: -I${includedir} -I@srcdir@/../gst-libs
+Libs: @abs_top_builddir@/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la
+Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs