[master] e6fe0ef Reflect Makefile changes

Lasse Karstensen lkarsten at varnish-software.com
Tue Apr 1 14:40:33 CEST 2014


commit e6fe0efa2c5d73c3063788dc1ab78e2c88f7992b
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Apr 1 14:39:00 2014 +0200

    Reflect Makefile changes

diff --git a/rules b/rules
index 41bc703..5ff61d6 100755
--- a/rules
+++ b/rules
@@ -34,9 +34,10 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install -a
 	@ # Install the example as default.
-	mkdir -p $(CURDIR)/debian/varnish/etc/
+	mkdir -p $(CURDIR)/debian/tmp/etc/varnish/
 	install -o root -g root -m 644 $(CURDIR)/etc/example.vcl \
-		$(CURDIR)/debian/varnish/etc/default.vcl
+		$(CURDIR)/debian/tmp/etc/varnish/default.vcl
+	rm $(CURDIR)/debian/tmp/usr/share/doc/varnish/*vcl
 	@ # Remove .la files
 	@ # (See http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
 	find $(CURDIR)/debian/ -name \*.la -delete
diff --git a/varnish-doc.docs b/varnish-doc.docs
index 11a5caa..f77d301 100644
--- a/varnish-doc.docs
+++ b/varnish-doc.docs
@@ -1,3 +1,3 @@
-doc/sphinx/=build/html
+doc/sphinx/build/html
 doc/*.html
 doc/*.css
diff --git a/varnish.examples b/varnish.examples
index 5dd46eb..19a5d10 100644
--- a/varnish.examples
+++ b/varnish.examples
@@ -1 +1 @@
-bin/varnishd/default.vcl
+bin/varnishd/builtin.vcl



More information about the varnish-commit mailing list