r5180 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-09-08 10:36:43 +0200 (Wed, 08 Sep 2010)
New Revision: 5180

Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Default parameters vmod_dir and vcl_dir to ${pkglibdir} and
${varnishconfdir} respectively.



Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2010-09-08 07:47:33 UTC (rev 5179)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2010-09-08 08:36:43 UTC (rev 5180)
@@ -83,7 +83,9 @@
 	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
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2010-09-08 07:47:33 UTC (rev 5179)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2010-09-08 08:36:43 UTC (rev 5180)
@@ -817,11 +817,21 @@
 		"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 }
 };