From c5948b0e13ba3a7995fcef41b85510cddde1fd00 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 18 Aug 2017 09:16:51 -0400 Subject: [PATCH 1/3] Use the value of --sysconfdir to access the configuration file. --- configure.in | 7 ++++++- es.c => es.c.in | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) rename es.c => es.c.in (99%) diff --git a/configure.in b/configure.in index 1ebf831..53eb403 100644 --- a/configure.in +++ b/configure.in @@ -144,4 +144,9 @@ fi AC_SUBST(FL_LEX) AC_SUBST(LIBS) -AC_OUTPUT(Makefile) +# Make sysconfdir available for substitution in es.c. +# Two "evals" are needed to squash out the extra $prefix. +AC_SUBST([_sysconfdir]) +AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) + +AC_OUTPUT(Makefile es.c) diff --git a/es.c b/es.c.in similarity index 99% rename from es.c rename to es.c.in index eb05908..8aa1a05 100644 --- a/es.c +++ b/es.c.in @@ -331,7 +331,7 @@ int settings_init() p = getenv("HOME"); sprintf(buf, "%s/.es.conf", p); fp = fopen(buf, "r"); - if (!fp) fp = fopen("/etc/es.conf", "r"); + if (!fp) fp = fopen("@_sysconfdir@/es.conf", "r"); if (!fp) return 1; while (fgets(buf, 512, fp)) { -- 2.13.6