--- gvpe/doc/Makefile.in	2004/02/08 07:24:25	1.5
+++ gvpe/doc/Makefile.in	2008/08/27 22:14:02	1.16
@@ -67,6 +67,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 HAVE_TUNTAP = @HAVE_TUNTAP@
 IFSUBTYPE = @IFSUBTYPE@
 IFTYPE = @IFTYPE@
@@ -77,6 +78,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_DAEMON = @LDFLAGS_DAEMON@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -113,8 +115,6 @@
 XGETTEXT = @XGETTEXT@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -129,22 +129,29 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -154,18 +161,17 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-# commented out, no use to distribute yet
-info_TEXINFOS = vpe.texi
+info_TEXINFOS = gvpe.texi
 
-man_MANS = vpe.5 vped.8 vpectrl.8 vped.conf.5 vpe.protocol.7 vpe.osdep.5
+man_MANS = gvpe.5 gvpe.8 gvpectrl.8 gvpe.conf.5 gvpe.protocol.7 gvpe.osdep.5
 
 PERL = @PERL@
-MAINTAINERCLEANFILES = vpe.texi vpe.5 vped.8 vpectrl.8 vped.conf.5 vpe.protocol.7 vpe.osdep.5
+MAINTAINERCLEANFILES = gvpe.texi gvpe.5 gvpe.8 gvpectrl.8 gvpe.conf.5 gvpe.protocol.7 gvpe.osdep.5
 
-EXTRA_DIST = $(man_MANS) vpe.texi \
-  Makefile.maint GNUmakefile Makefile.summ \
-  vpe.texi.in vpe.5.pod vped.8.pod vpectrl.8.pod vped.conf.5.pod vpe.protocol.7.pod vpe.osdep.5.pod \
-  complex-example/README complex-example/if-up complex-example/node-up complex-example/vped.conf
+EXTRA_DIST = $(man_MANS) gvpe.texi \
+  Makefile.maint pod2texi \
+  gvpe.texi.pod gvpe.5.pod gvpe.8.pod gvpectrl.8.pod gvpe.conf.5.pod gvpe.protocol.7.pod gvpe.osdep.5.pod \
+  complex-example/README complex-example/if-up complex-example/node-up complex-example/gvpe.conf
 
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -174,11 +180,11 @@
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 am__TEXINFO_TEX_DIR = $(srcdir)
-INFO_DEPS = vpe.info
-DVIS = vpe.dvi
-PDFS = vpe.pdf
-PSS = vpe.ps
-TEXINFOS = vpe.texi
+INFO_DEPS = gvpe.info
+DVIS = gvpe.dvi
+PDFS = gvpe.pdf
+PSS = gvpe.ps
+TEXINFOS = gvpe.texi
 
 NROFF = nroff
 MANS = $(man_MANS)
@@ -207,9 +213,9 @@
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-vpe.info: vpe.texi 
-vpe.dvi: vpe.texi 
-vpe.pdf: vpe.texi 
+gvpe.info: gvpe.texi 
+gvpe.dvi: gvpe.texi 
+gvpe.pdf: gvpe.texi 
 TEXI2DVI = texi2dvi
 
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
@@ -251,9 +257,9 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -f vpe.aux vpe.cp vpe.cps vpe.fn vpe.fns vpe.ky vpe.kys vpe.log vpe.pg \
-	  vpe.pgs vpe.tmp vpe.toc vpe.tp vpe.tps vpe.vr vpe.vrs vpe.dvi \
-	  vpe.pdf vpe.ps
+	-rm -f gvpe.aux gvpe.cp gvpe.cps gvpe.fn gvpe.fns gvpe.ky gvpe.kys gvpe.log \
+	  gvpe.pg gvpe.pgs gvpe.tmp gvpe.toc gvpe.tp gvpe.tps gvpe.vr \
+	  gvpe.vrs gvpe.dvi gvpe.pdf gvpe.ps
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \