From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 7 May 2013 14:35:40 +0000 (+0200)
Subject: Define DEFAULT_CONF_FILE in config.h
X-Git-Tag: 1.28-pre1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8ceaae8619cc70f5e0a8ea236587a490666a35;p=thirdparty%2Fchrony.git

Define DEFAULT_CONF_FILE in config.h
---

diff --git a/conf.c b/conf.c
index 0d330e82..af5da61e 100644
--- a/conf.c
+++ b/conf.c
@@ -54,14 +54,6 @@
 #include "broadcast.h"
 #include "util.h"
 
-/* ================================================== */
-
-#ifndef DEFAULT_CONF_DIR
-#define DEFAULT_CONF_DIR "/etc"
-#endif
-
-#define DEFAULT_CONF_FILE DEFAULT_CONF_DIR"/chrony.conf"
-
 /* ================================================== */
 /* Forward prototypes */
 
diff --git a/configure b/configure
index 58038548..7a4443a7 100755
--- a/configure
+++ b/configure
@@ -564,7 +564,7 @@ if [ "x$SETDOCDIR" != "x" ]; then
   DOCDIR=$SETDOCDIR
 fi
 
-add_def DEFAULT_CONF_DIR "\"$SYSCONFDIR\""
+add_def DEFAULT_CONF_FILE "\"$SYSCONFDIR/chrony.conf\""
 add_def MAIL_PROGRAM "\"$mail_program\""
 
 if [ -f version.txt ]; then