Mercurial > dillo_port1.3
changeset 1164:8f682d270874
group dillo system config files into a dillo subdir; have Paths use it
| author | corvid <corvid@lavabit.com> |
|---|---|
| date | Sun, 07 Jun 2009 01:55:13 +0000 |
| parents | f7a33ec4f4de |
| children | 17a265a70c5e |
| files | configure.in src/Makefile.am src/paths.cc src/paths.hh |
| diffstat | 4 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sat Jun 06 21:26:04 2009 +0200 +++ b/configure.in Sun Jun 07 01:55:13 2009 +0000 @@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE(dillo, 2.0) AM_CONFIG_HEADER(config.h) +sysconfdir=${sysconfdir}/${PACKAGE} dnl Options
--- a/src/Makefile.am Sat Jun 06 21:26:04 2009 +0200 +++ b/src/Makefile.am Sun Jun 07 01:55:13 2009 +0000 @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@ +AM_CPPFLAGS=-DDILLO_SYSCONF='"$(sysconfdir)/"' @LIBJPEG_CPPFLAGS@ AM_CFLAGS = @LIBPNG_CFLAGS@ AM_CXXFLAGS = -I.. @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
--- a/src/paths.cc Sat Jun 06 21:26:04 2009 +0200 +++ b/src/paths.cc Sun Jun 07 01:55:13 2009 +0000 @@ -80,7 +80,7 @@ if (!(fp = fopen(path, "r"))) { MSG("paths: Cannot open file '%s'\n", path); - char *path2 = dStrconcat(PATHS_RC_SYS, rcFile, NULL); + char *path2 = dStrconcat(DILLO_SYSCONF, rcFile, NULL); if (!(fp = fopen(path2, "r"))) { MSG("paths: Cannot open file '%s'\n",path2); MSG("paths: Using internal defaults...\n");