diff -pru dillo1/src/Makefile.am dillo2/src/Makefile.am --- dillo1/src/Makefile.am Wed Apr 2 19:40:36 2003 +++ dillo2/src/Makefile.am Wed Apr 2 20:10:31 2003 @@ -2,6 +2,8 @@ SUBDIRS = IO bin_PROGRAMS = dillo +AM_CFLAGS = -DDILLO_SYSCONFDIR=\"${sysconfdir}\" + dillo_LDADD = IO/libDio.a @LIBJPEG_LIB@ dillo_SOURCES = \ diff -pru dillo1/src/prefs.c dillo2/src/prefs.c --- dillo1/src/prefs.c Wed Apr 2 19:40:36 2003 +++ dillo2/src/prefs.c Wed Apr 2 20:07:10 2003 @@ -250,10 +250,9 @@ static gint Prefs_load(void) file = a_Misc_prepend_user_home(".dillo/dillorc"); fd = open(file, O_RDONLY); g_free(file); - if (fd < 0 && (fd = open("/etc/dillorc", O_RDONLY)) < 0) - if ((fd = open("/usr/local/etc/dillorc", O_RDONLY)) < 0) - return FILE_NOT_FOUND; - + if (fd < 0 && (fd = open(DILLO_SYSCONFDIR, O_RDONLY)) < 0) + return FILE_NOT_FOUND; + fcntl(fd, F_SETFD, FD_CLOEXEC | fcntl(fd, F_GETFD)); scanner = g_scanner_new(NULL);