honor SYSCONFDIR; we own ogg123rc

This commit is contained in:
naddy 2003-09-30 00:21:42 +00:00
parent 94fa5ef51a
commit 1b95d38ea0
3 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ogg123_Makefile_in,v 1.5 2003/09/30 00:21:42 naddy Exp $
--- ogg123/Makefile.in.orig 2003-09-30 02:13:45.000000000 +0200
+++ ogg123/Makefile.in 2003-09-30 02:14:39.000000000 +0200
@@ -122,7 +122,7 @@ ogg123sources = audio.c buffer.c callbac
@BUILD_OGG123_TRUE@datadir = @datadir@
@BUILD_OGG123_TRUE@localedir = $(datadir)/locale
-@BUILD_OGG123_TRUE@DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+@BUILD_OGG123_TRUE@DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
@BUILD_OGG123_TRUE@bin_PROGRAMS = ogg123
@BUILD_OGG123_TRUE@docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ogg123_cfgfile_options_c,v 1.1 2003/09/30 00:21:42 naddy Exp $
--- ogg123/cfgfile_options.c.orig 2003-09-30 02:15:22.000000000 +0200
+++ ogg123/cfgfile_options.c 2003-09-30 02:15:39.000000000 +0200
@@ -441,7 +441,7 @@ void parse_std_configs (file_option_t op
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);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2002/07/20 00:52:45 naddy Exp $
@comment $OpenBSD: PLIST,v 1.6 2003/09/30 00:21:42 naddy Exp $
bin/ogg123
bin/oggdec
bin/oggenc
@ -17,3 +17,5 @@ share/locale/fr/LC_MESSAGES/vorbis-tools.mo
share/locale/nl/LC_MESSAGES/vorbis-tools.mo
share/locale/sv/LC_MESSAGES/vorbis-tools.mo
@dirrm share/examples/vorbis-tools
@cwd ${SYSCONFDIR}
@extra ogg123rc