Make VARNISH_STATE_DIR work correctly when using the default prefix.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2116 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index abcfea66a9fdae45251fa7b30339888f91ab3c35..5cbee2c6dc93f702a81ad09d9c58f34fc876ef58 100644 (file)
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -64,7 +64,8 @@ noinst_HEADERS = \
        steps.h \
        stevedore.h
 
-varnishd_CFLAGS = -include config.h
+varnishd_CFLAGS = -include config.h \
+        -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
 varnishd_LDFLAGS = -export-dynamic
 

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 269befe94932c0a8ca5c22d53f50dfb1868b0dc8..07e136cca9fd255360eb964dcbfd2d3986c20609 100644 (file)
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -115,9 +115,8 @@ AC_CHECK_FUNCS([epoll_ctl])
 AC_CHECK_FUNCS([poll])
 
 # Run-time directory
-VARNISH_STATE_DIR=`eval "echo $localstatedir/varnish"`
-AC_DEFINE_UNQUOTED(VARNISH_STATE_DIR, "$VARNISH_STATE_DIR",
-  [Base directory for run-time state])
+VARNISH_STATE_DIR="${localstatedir}/varnish"
+AC_SUBST(VARNISH_STATE_DIR)
 
 # Now that we're done using the compiler to look for functions and
 # libraries, set CFLAGS to what we want them to be for our own code

diff --git a/varnish-cache/lib/libvarnishapi/Makefile.am b/varnish-cache/lib/libvarnishapi/Makefile.am
index c47ddd68cdcc918e5c8e2436bb60448102c82f16..5a6114a44e3c8bef89c45a818a7edf7a1c4faae9 100644 (file)
--- a/varnish-cache/lib/libvarnishapi/Makefile.am
+++ b/varnish-cache/lib/libvarnishapi/Makefile.am
@@ -9,4 +9,5 @@ libvarnishapi_la_SOURCES = \
        instance.c \
        shmlog.c
 
-libvarnishapi_la_CFLAGS = -include config.h
+libvarnishapi_la_CFLAGS = -include config.h \
+       -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'