4 files changed, 26 insertions, 21 deletions
diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index ad3439b4..1255a6bf 100644
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -1,13 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+libdir=${pcfiledir}/../gst-libs/gst/gconf
+includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer GConf Library, uninstalled
 Description: Streaming media framework, GConf support library, not installed
-Requires: gstreamer >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
 Version: @VERSION@
 
-Libs: ${pcfiledir}/../gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 1637411b..3c1665f6 100644
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,13 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Interfaces library, uninstalled
 Description: Streaming-media framework, interfaces library, not installed
-Requires: gstreamer >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
 Version: @VERSION@
 
-Libs: ${pcfiledir}/../gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstinterfaces-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 3ce3d6d4..79a949b1 100644
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,9 +1,13 @@
+# the standard variables don't make sense for an uninstalled copy
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/../gst-libs/gst
+includedir=${pcfiledir}/../gst-libs
+
 Name: GStreamer Uninstalled Media-Specific Libraries
 Description: Streaming-media framework media-specific libraries, not installed
 Version: @VERSION@
-Requires: gstreamer = @VERSION@
-Libs: -L${pcfiledir}/../gst-libs/gst/gconf \
-	-L${pcfiledir}/../gst-libs/gst/audio \
-	-L${pcfiledir}/../gst-libs/gst/video \
-	-L${pcfiledir}/../gst-libs/gst/play
-Cflags: -I${pcfiledir}/../gst-libs
+Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+
+Libs: -L${libdir}/audio -L${libdir}/video
+Cflags: -I${includedir}
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 6bc27e77..7d77ee82 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,13 +1,14 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}
-includedir=${pcfiledir}
+libdir=${pcfiledir}/../gst-libs/gst/play
+includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer Play Library, uninstalled
 Description: Streaming-media framework, play libraries, not installed
-Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ \
+          gstreamer-control-@GST_MAJORMINOR@ >= @VERSION@
 Version: @VERSION@
 
-Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/../gst-libs
+Libs: ${libdir}/libgstplay-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}