Move the list of resolvers to $pkgdatadir

opendns · Apr 17, 2014 · 8e0f619 · 8e0f619
1 parent 3982369
commit 8e0f619
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -237,8 +237,6 @@ AS_IF([test -d /usr/local/lib], [
   LDFLAGS="$LDFLAGS -L/usr/local/lib"
 ])
 
-CPPFLAGS="$CPPFLAGS -DCONFDIR=\\\"$sysconfdir\\\""
-
 dnl Checks for header files.
 
 AC_SYS_LARGEFILE

diff --git a/src/proxy/Makefile.am b/src/proxy/Makefile.am
@@ -48,7 +48,8 @@ AM_CFLAGS = @CWFLAGS@
 
 AM_CPPFLAGS = \
 	-I../ext \
-	-I../libevent-modified/include
+	-I../libevent-modified/include \
+	-DPKGDATADIR='"${pkgdatadir}"'
 
 dnscrypt_proxy_LDADD = \
 	../libevent-modified/libevent_extra.la \

diff --git a/src/proxy/dnscrypt_proxy.h b/src/proxy/dnscrypt_proxy.h
@@ -40,7 +40,7 @@
 #endif
 
 #ifndef DEFAULT_RESOLVERS_LIST
-# define DEFAULT_RESOLVERS_LIST CONFDIR "/dnscrypt-resolvers.csv"
+# define DEFAULT_RESOLVERS_LIST PKGDATADIR "/dnscrypt-resolvers.csv"
 #endif
 
 #ifndef DEFAULT_RESOLVER_NAME