Replace bare if statements with AS_IF in configure.ac.

[tinc] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2ada5d7..5c64ffa 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,11 +2,11 @@
 
 info_TEXINFOS = tinc.texi
 
-man_MANS = tincd.8 tincctl.8 tinc.conf.5 tinc-gui.8
+man_MANS = tincd.8 tinc.8 tinc.conf.5 tinc-gui.8
 
-EXTRA_DIST = tincinclude.texi.in tincd.8.in tincctl.8.in tinc.conf.5.in tinc-gui.8.in sample-config.tar.gz
+EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.8.in tinc.conf.5.in tinc-gui.8.in sample-config.tar.gz
 
-CLEANFILES = *.html tinc.info tincd.8 tincctl.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
+CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
 
 # Use `ginstall' in the definition of man_MANS to avoid
 # confusion with the `install' target.  The install rule transforms `ginstall'
@@ -17,15 +17,12 @@ transform = s/ginstall/install/; @program_transform_name@
 # see GNUmakefile and Makefile.maint.
 
 sample-config.tar.gz: sample-config
-       GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz --exclude .svn sample-config
-
-texi2html: tinc.texi
-       texi2html -split=chapter tinc.texi
+       GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
 
 tincd.8.html: tincd.8
        w3mman2html $? > $@
 
-tincctl.8.html: tincctl.8
+tinc.8.html: tinc.8
        w3mman2html $? > $@
 
 tinc-gui.8.html: tinc-gui.8
@@ -43,7 +40,7 @@ substitute = sed \
 tincd.8: tincd.8.in
        $(substitute) $? > $@
 
-tincctl.8: tincctl.8.in
+tinc.8: tinc.8.in
        $(substitute) $? > $@
 
 tinc-gui.8: tinc-gui.8.in