# HG changeset patch # User Luke Schierer # Date 1082316053 0 # Node ID 68d8280c5e1382fb688ee314fbb2421f4576fa0f # Parent ddcafeb14e3585788fa628a981d83f604d0fa796 [gaim-migrate @ 9455] " This patch fixes this "fixme" by using sysconfdir as passed to ./configure /* * We're hard-coding /etc here, which may not be great, but for * now it works. This was requested by the Fedora guys for the * upcoming FC2 release. */" --Stu Tomlinson committer: Tailor Script diff -r ddcafeb14e35 -r 68d8280c5e13 src/Makefile.am --- a/src/Makefile.am Sun Apr 18 18:40:41 2004 +0000 +++ b/src/Makefile.am Sun Apr 18 19:20:53 2004 +0000 @@ -215,6 +215,7 @@ -DDATADIR=\"$(datadir)\" \ -DLIBDIR=\"$(libdir)/gaim/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_srcdir)/plugins \ $(AUDIOFILE_CFLAGS) \ $(AO_CFLAGS) \ diff -r ddcafeb14e35 -r 68d8280c5e13 src/prefs.c --- a/src/prefs.c Sun Apr 18 18:40:41 2004 +0000 +++ b/src/prefs.c Sun Apr 18 19:20:53 2004 +0000 @@ -912,12 +912,7 @@ error = NULL; - /* - * We're hard-coding /etc here, which may not be great, but for - * now it works. This was requested by the Fedora guys for the - * upcoming FC2 release. - */ - filename = g_build_filename("/etc", "gaim", "prefs.xml", NULL); + filename = g_build_filename(SYSCONFDIR, "gaim", "prefs.xml", NULL); gaim_debug(GAIM_DEBUG_INFO, "prefs", "Reading %s\n", filename);