Download as
Browse Code »

Commit 12daa5703f7abfe5899f1de32f6ee59c87b4eeba

Authored by Perry Werneck
1 parent 53cc0664
Exists in master and in 3 other branches develop, macos, network_module

Fixing windows builds.

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
@@ -81,6 +81,8 @@ datarootdir=@datarootdir@ @@ -81,6 +81,8 @@ datarootdir=@datarootdir@
81 localedir=@localedir@ 81 localedir=@localedir@
82 docdir=@docdir@ 82 docdir=@docdir@
83 sysconfdir=@sysconfdir@ 83 sysconfdir=@sysconfdir@
  84 +datadir=$(datarootdir)/@PRODUCT_NAME@
  85 +confdir=$(sysconfdir)/@PRODUCT_NAME@
84 86
85 BASEDIR=@BASEDIR@ 87 BASEDIR=@BASEDIR@
86 88
@@ -106,8 +108,6 @@ CFLAGS= \ @@ -106,8 +108,6 @@ CFLAGS= \
106 @CFLAGS@ \ 108 @CFLAGS@ \
107 -g \ 109 -g \
108 -I$(BASEDIR)/src/include \ 110 -I$(BASEDIR)/src/include \
109 - -DDATADIR=$(datarootdir)/@PRODUCT_NAME@ \  
110 - -DCONFDIR=$(sysconfdir)/@PRODUCT_NAME@ \  
111 @LIBSSL_CFLAGS@ \ 111 @LIBSSL_CFLAGS@ \
112 @LDAP_CFLAGS@ \ 112 @LDAP_CFLAGS@ \
113 @LIBCURL_CFLAGS@ 113 @LIBCURL_CFLAGS@
@@ -108,10 +108,11 @@ case "$host" in @@ -108,10 +108,11 @@ case "$host" in
108 108
109 app_cv_static='no' 109 app_cv_static='no'
110 110
  111 + CFLAGS="$CFLAGS -DCONFDIR=\$(confdir) -DDATADIR=\$(datadir)"
111 ;; 112 ;;
112 113
113 *) 114 *)
114 - CFLAGS="$CFLAGS -pthread" 115 + CFLAGS="$CFLAGS -pthread -DCONFDIR=\$(confdir) -DDATADIR=\$(datadir)"
115 LDFLAGS="$LDFLAGS -pthread" 116 LDFLAGS="$LDFLAGS -pthread"
116 app_cv_osname="linux" 117 app_cv_osname="linux"
117 LOGDIR="/var/log" 118 LOGDIR="/var/log"