From 2d9c2e484b366963ebe7293fffc4a0f4982e1e35 Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Thu, 28 Nov 2002 13:29:52 +0000 Subject: 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 :) --- tools/Makefile.am | 21 ++++++++++++++------- tools/gst-complete.c | 4 ++-- tools/gst-compprep.c | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 5d0d3b2f28..7a1d79b282 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -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 diff --git a/tools/gst-complete.c b/tools/gst-complete.c index 5430be1182..4091e54658 100644 --- a/tools/gst-complete.c +++ b/tools/gst-complete.c @@ -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); } diff --git a/tools/gst-compprep.c b/tools/gst-compprep.c index 47ba36ab74..7e0783652c 100644 --- a/tools/gst-compprep.c +++ b/tools/gst-compprep.c @@ -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; -- cgit v1.2.3