[xiph-commits] r14480 - trunk/vorbis-tools/ogg123

[ivo at svn.xiph.org]

Author: ivo
Date: 2008-02-11 12:38:07 -0800 (Mon, 11 Feb 2008)
New Revision: 14480

Modified:
   trunk/vorbis-tools/ogg123/Makefile.am
   trunk/vorbis-tools/ogg123/cfgfile_options.c
Log:
Patch by Christian Weisgerber so as not to hardcode the configuration path to /etc.

Modified: trunk/vorbis-tools/ogg123/Makefile.am
===================================================================
--- trunk/vorbis-tools/ogg123/Makefile.am	2008-02-11 20:37:13 UTC (rev 14479)
+++ trunk/vorbis-tools/ogg123/Makefile.am	2008-02-11 20:38:07 UTC (rev 14480)
@@ -12,7 +12,7 @@
 
 datadir = @datadir@
 localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 mandir = @MANDIR@

Modified: trunk/vorbis-tools/ogg123/cfgfile_options.c
===================================================================
--- trunk/vorbis-tools/ogg123/cfgfile_options.c	2008-02-11 20:37:13 UTC (rev 14479)
+++ trunk/vorbis-tools/ogg123/cfgfile_options.c	2008-02-11 20:38:07 UTC (rev 14480)
@@ -445,7 +445,7 @@
   char filename[FILENAME_MAX];
   char *homedir = getenv("HOME");
 
-  parse_config_file(opts, "/etc/ogg123rc");
+  parse_config_file(opts, SYSCONFDIR "/ogg123rc");
   if (homedir && strlen(homedir) < FILENAME_MAX - 10) {
     /* Try ~/.ogg123 */
     strncpy(filename, homedir, FILENAME_MAX);