r5462 - in trunk/varnish-cache/bin: varnishd varnishhist varnishlog varnishncsa varnishreplay varnishstat varnishtest varnishtop

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-10-25 10:44:59 +0200 (Mon, 25 Oct 2010)
New Revision: 5462

Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishhist/Makefile.am
   trunk/varnish-cache/bin/varnishlog/Makefile.am
   trunk/varnish-cache/bin/varnishncsa/Makefile.am
   trunk/varnish-cache/bin/varnishreplay/Makefile.am
   trunk/varnish-cache/bin/varnishstat/Makefile.am
   trunk/varnish-cache/bin/varnishtest/Makefile.am
   trunk/varnish-cache/bin/varnishtop/Makefile.am
Log:
Get rid of extra HAVE_RST2MAN checks

There were too many checks for whether we had rst2man in the
Makefile.am files, leading us to not install files properly if rst2man
was not available.  Fix this.


Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 sbin_PROGRAMS = varnishd
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishd.1
-endif
 
 varnishd_SOURCES = \
 	cache_acceptor.c \

Modified: trunk/varnish-cache/bin/varnishhist/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishhist/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishhist/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishhist
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishhist.1
-endif
 
 varnishhist_SOURCES = varnishhist.c
 

Modified: trunk/varnish-cache/bin/varnishlog/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishlog/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishlog/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishlog
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishlog.1
-endif
 
 varnishlog_SOURCES = varnishlog.c
 

Modified: trunk/varnish-cache/bin/varnishncsa/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishncsa/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishncsa
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishncsa.1
-endif
 
 varnishncsa_SOURCES = varnishncsa.c
 

Modified: trunk/varnish-cache/bin/varnishreplay/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishreplay/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishreplay/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishreplay
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishreplay.1
-endif
 
 varnishreplay_SOURCES = \
 	varnishreplay.c

Modified: trunk/varnish-cache/bin/varnishstat/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishstat/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishstat/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishstat
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishstat.1
-endif
 
 varnishstat_SOURCES = \
 	varnishstat.h \

Modified: trunk/varnish-cache/bin/varnishtest/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -9,9 +9,7 @@
 
 bin_PROGRAMS =	varnishtest
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishtest.1
-endif
 
 varnishtest_SOURCES = \
 		vtc.c \

Modified: trunk/varnish-cache/bin/varnishtop/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtop/Makefile.am	2010-10-25 08:37:54 UTC (rev 5461)
+++ trunk/varnish-cache/bin/varnishtop/Makefile.am	2010-10-25 08:44:59 UTC (rev 5462)
@@ -4,9 +4,7 @@
 
 bin_PROGRAMS = varnishtop
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishtop.1
-endif
 
 varnishtop_SOURCES = varnishtop.c