[master] e09222a Try to unbreak make distcheck

Poul-Henning Kamp phk at FreeBSD.org
Mon Dec 9 19:51:43 CET 2013


commit e09222ae1e456a7e71d8bfb71f4856c4e502bcda
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 9 18:51:24 2013 +0000

    Try to unbreak make distcheck

diff --git a/autogen.des b/autogen.des
index d546bc7..a385c71 100755
--- a/autogen.des
+++ b/autogen.des
@@ -18,6 +18,7 @@ rm -f configure
 # autoconf prior to 2.62 has issues with zsh 4.2 and newer
 export CONFIG_SHELL=/bin/sh
 
+env MAKE=gmake \
 ./configure \
     --enable-developer-warnings \
     --enable-debugging-symbols \
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index f73720c..18d5ecf 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -29,4 +29,6 @@ vcc_if.c vcc_if.h: $(vmodtool) $(vmod_srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc
 
-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
+CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+	$(builddir)/vmod_debug.rst \
+	$(builddir)/vmod_debug.man.rst
diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 7e2e2f3..3c2c378 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -33,4 +33,6 @@ vcc_if.c vcc_if.h: $(vmodtool) $(vmod_srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc
 
-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
+CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+	$(builddir)/vmod_directors.rst \
+	$(builddir)/vmod_directors.man.rst
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index cd55e5b..cd8aebf 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -33,7 +33,9 @@ vcc_if.c vcc_if.h: $(vmodtool) $(vmod_srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc
 
-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
+CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+	$(builddir)/vmod_std.rst \
+	$(builddir)/vmod_std.man.rst
 
 vmod_std.3: $(top_srcdir)/doc/sphinx/reference/vmod_std.rst
 if HAVE_RST2MAN



More information about the varnish-commit mailing list