diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-05 12:13:10 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-05 12:13:10 +0000 |
| commit | fd43bd5e7c5719209a4581b0d9d8c3119e645075 (patch) | |
| tree | 2b81d0112f270a724f12478fe9e1f037de30d2a2 | |
| parent | 797e849606626ebca8382979539a70b13e45d6e6 (diff) | |
| download | gst-plugins-bad-fd43bd5e7c5719209a4581b0d9d8c3119e645075.tar.gz gst-plugins-bad-fd43bd5e7c5719209a4581b0d9d8c3119e645075.tar.bz2 gst-plugins-bad-fd43bd5e7c5719209a4581b0d9d8c3119e645075.zip | |
fix gconf install path
Original commit message from CVS:
fix gconf install path
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gconf/gstreamer.schemas.in | 20 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/Makefile.am | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-interfaces-uninstalled.pc.in | 1 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-libs-uninstalled.pc.in | 1 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-play-uninstalled.pc.in | 1 |
6 files changed, 21 insertions, 14 deletions
@@ -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/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in index ac38edfe..e40af399 100644 --- a/gconf/gstreamer.schemas.in +++ b/gconf/gstreamer.schemas.in @@ -1,8 +1,8 @@ <gconfschemafile> <schemalist> <schema> - <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/audiosink</key> - <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/audiosink</applyto> + <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</key> + <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</applyto> <owner>gstreamer</owner> <type>string</type> <default>osssink</default> @@ -12,8 +12,8 @@ </locale> </schema> <schema> - <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/videosink</key> - <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/videosink</applyto> + <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosink</key> + <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto> <owner>gstreamer</owner> <type>string</type> <default>xvimagesink</default> @@ -23,8 +23,8 @@ </locale> </schema> <schema> - <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/audiosrc</key> - <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/audiosrc</applyto> + <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</key> + <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</applyto> <owner>gstreamer</owner> <type>string</type> <default>osssrc</default> @@ -34,8 +34,8 @@ </locale> </schema> <schema> - <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/videosrc</key> - <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/videosrc</applyto> + <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</key> + <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</applyto> <owner>gstreamer</owner> <type>string</type> <default>v4lsrc</default> @@ -45,8 +45,8 @@ </locale> </schema> <schema> - <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/visualization</key> - <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/visualization</applyto> + <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/visualization</key> + <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/visualization</applyto> <owner>gstreamer</owner> <type>string</type> <default>goom</default> diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am index b7a409ef..64bebf9f 100644 --- 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 3c1665f6..ae346b76 100644 --- 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 55c9bc54..46161505 100644 --- 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 7d77ee82..27cdf6ff 100644 --- 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 |