--- gvpe/doc/Makefile.maint	2003/03/23 14:58:21	1.3
+++ gvpe/doc/Makefile.maint	2005/01/22 17:39:07	1.10
@@ -8,8 +8,6 @@
 
 include Makefile.summ
 
-HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN)
-
 # Depend on configure.in to get version number changes.
 $(dyn_MANS): $(top_srcdir)/configure.in
 
@@ -19,30 +17,19 @@
 $(regular-men): %.8: $(top_srcdir)/src/%.c
 
 executable = $(patsubst %/install,%/ginstall, ../src/$(basename $@))
-$(dyn_MANS): %.8: %.x $(HELP2MAN)
-	@if test -f $(executable); then \
-	  echo "Updating man page $@"; \
-	  rm -f $@-t $@; \
-	  $(HELP2MAN-run) \
-	    --name="$($(basename $@)-summary)" \
-	    --include=$(basename $@).x \
-	    $(executable) > $@-t; \
-	  chmod -w $@-t; \
-	  mv $@-t $@; \
-	else \
-	  echo "WARNING: The man page $@ cannot be updated yet."; \
-	  echo "         Retry once the corresponding executable is built."; \
-	fi
-
-sample-config.tar.gz:
-	GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz sample-config
 
-%.5: %.pod
-	pod2man -r $(VERSION) -s 5 -c "Virtual Private Ethernet" $< >$@
+%.5: %.5.pod Makefile.maint
+	pod2man -n$(shell perl -e '$$ARGV[0] =~ s/\.\d$$//; print uc $$ARGV[0]' $@) -qnone -r$(VERSION) -s5 -c "GNU Virtual Private Ethernet" $< >$@
+
+%.7: %.7.pod Makefile.maint
+	pod2man -n$(shell perl -e '$$ARGV[0] =~ s/\.\d$$//; print uc $$ARGV[0]' $@) -qnone -r$(VERSION) -s7 -c "GNU Virtual Private Ethernet" $< >$@
+
+%.8: %.8.pod Makefile.maint
+	pod2man -n$(shell perl -e '$$ARGV[0] =~ s/\.\d$$//; print uc $$ARGV[0]' $@) -qnone -r$(VERSION) -s8 -c "GNU Virtual Private Ethernet" $< >$@
 
-%.8: %.pod
-	pod2man -r $(VERSION) -s 8 -c "Virtual Private Ethernet" $< >$@
+gvpe.texi: gvpe.texi.pod
+	./pod2texi <gvpe.texi.pod >gvpe.texi
 
-../README: vpe.pod
-	pod2text -q\\\" -a vpe.pod >../README
+../README: gvpe.5.pod
+	pod2text -q\\\" -a gvpe.5.pod >../README