diff --git a/Makefile.in b/Makefile.in
index bbc7748..8bd7048 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,6 +81,8 @@ datarootdir=@datarootdir@
 localedir=@localedir@
 docdir=@docdir@
 sysconfdir=@sysconfdir@
+datadir=$(datarootdir)/@PRODUCT_NAME@
+confdir=$(sysconfdir)/@PRODUCT_NAME@
 
 BASEDIR=@BASEDIR@
 
@@ -106,8 +108,6 @@ CFLAGS= \
 	@CFLAGS@ \
 	-g \
 	-I$(BASEDIR)/src/include \
-	-DDATADIR=$(datarootdir)/@PRODUCT_NAME@ \
-	-DCONFDIR=$(sysconfdir)/@PRODUCT_NAME@ \
 	@LIBSSL_CFLAGS@ \
 	@LDAP_CFLAGS@ \
 	@LIBCURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 112e47d..164dd8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,11 @@ case "$host" in
 
 		app_cv_static='no'
 
+		CFLAGS="$CFLAGS -DCONFDIR=\$(confdir) -DDATADIR=\$(datadir)"
 		;;
 
  	*)
-		CFLAGS="$CFLAGS -pthread"
+		CFLAGS="$CFLAGS -pthread -DCONFDIR=\$(confdir) -DDATADIR=\$(datadir)"
 		LDFLAGS="$LDFLAGS -pthread"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
--
libgit2 0.21.2