Commit 2d9c2e48 authored by Christian Schaller's avatar Christian Schaller

commiting Leifs registry to /var/cache patch, works well for me :)

Original commit message from CVS:
commiting Leifs registry to /var/cache patch, works well for me :)
parent af236bd2
......@@ -36,6 +36,8 @@ configure-stamp:
--with-html-dir=\$${prefix}/share/doc/gstreamer-doc \
--sysconfdir=/etc \
--with-configdir=/etc/gstreamer \
--localstatedir=/var \
--with-cachedir=/var/cache/gstreamer \
--disable-plugin-builddir \
--disable-tests \
--disable-examples \
......
......@@ -183,11 +183,11 @@ dist-hook:
distclean-local:
rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
libgstreamer_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
libgstreamer_la_CFLAGS = -D_GNU_SOURCE \
$(LIBGST_CFLAGS) \
-D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\"
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
# the compiler shoots cothreads.c in the head at -O6
libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2
......
......@@ -26,7 +26,7 @@
#include <gst/gstplugin.h>
#define GLOBAL_REGISTRY_DIR GST_CONFIG_DIR
#define GLOBAL_REGISTRY_DIR GST_CACHE_DIR
#define GLOBAL_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry.xml"
#define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp"
......
......@@ -23,29 +23,36 @@ man_MANS = gst-launch.1 gst-md5sum.1 gst-register.1 gst-inspect.1 \
gst-feedback.1
gst_launch_LDADD = $(GST_LIBS) #-lefence
gst_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_md5sum_LDADD = $(GST_LIBS) #-lefence
gst_md5sum_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_md5sum_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
if !GST_DISABLE_REGISTRY
gst_register_LDADD = $(GST_LIBS)
gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
endif
gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol.la
gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_complete_LDADD = $(GST_LIBS)
gst_complete_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_complete_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
if !GST_DISABLE_LOADSAVE
gst_compprep_LDADD = $(GST_LIBS)
gst_compprep_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_compprep_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_xmllaunch_SOURCES = gst-launch.c
gst_xmllaunch_LDADD = $(GST_LIBS)
gst_xmllaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
gst_xmllaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
endif
EXTRA_DIST = $(man_MANS) gst-feedback
......@@ -81,8 +81,8 @@ int main(int argc,char *argv[]) {
/***** Loading the completion information from the registry *****/
if (stat (GST_CONFIG_DIR"/compreg.xml", &stat_buf) == 0) {
doc = xmlParseFile (GST_CONFIG_DIR"/compreg.xml");
if (stat (GST_CACHE_DIR"/compreg.xml", &stat_buf) == 0) {
doc = xmlParseFile (GST_CACHE_DIR"/compreg.xml");
} else {
exit (1);
}
......
......@@ -99,9 +99,9 @@ int main(int argc,char *argv[]) {
}
#ifdef HAVE_LIBXML2
xmlSaveFormatFile(GST_CONFIG_DIR "/compreg.xml",doc,1);
xmlSaveFormatFile(GST_CACHE_DIR "/compreg.xml",doc,1);
#else
xmlSaveFile(GST_CONFIG_DIR "/compreg.xml",doc);
xmlSaveFile(GST_CACHE_DIR "/compreg.xml",doc);
#endif
return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment