Default parameters vmod_dir and vcl_dir to ${pkglibdir} and

${varnishconfdir} respectively.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5180 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/Makefile.am

@@ -83,7 +83,9 @@ noinst_HEADERS = \
 	vparam.h
 
 varnishd_CFLAGS = \
-        -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
+        -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
+	-DVARNISH_VMOD_DIR='"${pkglibdir}"' \
+	-DVARNISH_VCL_DIR='"${varnishconfdir}"'
 
 varnishd_LDFLAGS = -export-dynamic
 

bin/varnishd/mgt_param.c

@@ -817,11 +817,21 @@ static const struct parspec input_parspec[] = {
 		"Directory from which relative VCL filenames (vcl.load and "
 		"include) are opened.",
 		0,
-		".", NULL },
+#ifdef VARNISH_VCL_DIR
+		VARNISH_VCL_DIR,
+#else
+		".",
+#endif
+		NULL },
 	{ "vmod_dir", tweak_string, &mgt_vmod_dir, 0, 0,
 		"Directory where VCL modules are to be found.",
 		0,
-		".", NULL },
+#ifdef VARNISH_VMOD_DIR
+		VARNISH_VMOD_DIR,
+#else
+		".",
+#endif
+		NULL },
 	{ NULL, NULL, NULL }
 };