fix gconf install path

Original commit message from CVS:
fix gconf install path

diff --git a/ChangeLog b/ChangeLog
index 193a43f..8d5c79f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gconf/gstreamer.schemas.in:
+       * gst-libs/gst/gconf/Makefile.am:
+          version installation path the same way as for 0.6
+       * pkgconfig/gstreamer-interfaces-uninstalled.pc.in:
+       * pkgconfig/gstreamer-libs-uninstalled.pc.in:
+       * pkgconfig/gstreamer-play-uninstalled.pc.in:
+          remove comment that was fixed
+
 2004-03-05  David Schleef  <ds@schleef.org>
 
        * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_src_formats),

diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index b7a409e..64bebf9 100644 (file)
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -10,7 +10,7 @@ libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
 noinst_PROGRAMS = test-gconf
 
 # add define for GST_GCONF_DIR
-DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer-@GST_MAJORMINOR@\"
+DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
 
 test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
 test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la

diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 3c1665f..ae346b7 100644 (file)
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
 libdir=${pcfiledir}/../gst-libs/gst

diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 55c9bc5..4616150 100644 (file)
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
 libdir=${pcfiledir}/../gst-libs/gst

diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 7d77ee8..27cdf6f 100644 (file)
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
 libdir=${pcfiledir}/../gst-libs/gst/play