Modified autoconf/automake files for doc subdirectory so that all of

Ethereal can be compiled in a build directory separated from the source
directory.

svn path=/trunk/; revision=468

Makefile.am

@@ -157,6 +157,6 @@ EXTRA_DIST = \
 
 SUBDIRS = wiretap @SUBDIRS@
 
-ethereal.1: ethereal doc/ethereal.pod.template VERSION
+ethereal.1: ethereal doc/ethereal.pod.template
 	(cd doc ; \
 	make ../ethereal.1 )

autogen.sh

@@ -2,7 +2,7 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.3 1999/08/04 00:21:37 guy Exp $
+# $Id: autogen.sh,v 1.4 1999/08/11 16:05:11 gram Exp $
 
 DIE=0
 PROJECT="Ethereal"
@@ -40,14 +40,6 @@ for dir in . wiretap ;  do
 		autoheader; automake --add-missing --gnu $am_opt; autoconf)
 done
 
-for dir in doc;  do
-	echo processing $dir
-	(cd $dir; \
-		aclocalinclude="$ACLOCAL_FLAGS"; \
-		aclocal $aclocalinclude; \
-		autoheader; autoconf)
-done
-
 ./configure "$@"
 
 echo

configure.in

@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.35 1999/08/05 17:08:13 gram Exp $
+# $Id: configure.in,v 1.36 1999/08/11 16:05:11 gram Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(etypes.h)
 
@@ -13,6 +13,10 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_YACC
 AM_PROG_LEX
+AC_PATH_PROG(PERL_PATH, perl)
+
+AC_SUBST(PERL_PATH)
+
 
 # If we're running gcc, add '-Wall' to CFLAGS.
 AC_MSG_CHECKING(to see if we can add '-Wall' to CFLAGS)
@@ -145,5 +149,6 @@ dnl blank for now, but will be used in future
 AC_SUBST(SUBDIRS)
 
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SUBDIRS(wiretap doc)
-AC_OUTPUT(Makefile)
+AC_CONFIG_SUBDIRS(wiretap)
+AC_OUTPUT(Makefile doc/Makefile doc/dfilter2pod,
+	[chmod +x doc/dfilter2pod])

doc/Makefile

@@ -1,11 +0,0 @@
-../ethereal.1: ethereal.pod
-	pod2man ethereal.pod                     \
-	--center="The Ethereal Network Analyzer" \
-	--release=`cat ../VERSION`               \
-	> ../ethereal.1
-
-ethereal.pod: ethereal.pod.template  ../ethereal
-	rm -f ethereal-dump-fields
-	ln ../ethereal ethereal-dump-fields
-	./ethereal-dump-fields | ./dfilter2pod ethereal.pod.template > ethereal.pod
-	rm -f ethereal-dump-fields

doc/Makefile.in

@@ -0,0 +1,33 @@
+PACKAGE = @PACKAGE@
+SHELL = @SHELL@
+VERSION = @VERSION@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+
+../ethereal.1: ethereal.pod
+	pod2man ethereal.pod                     \
+	--center="The Ethereal Network Analyzer" \
+	--release=$(VERSION)			 \
+	> ../ethereal.1
+
+ethereal.pod: ethereal.pod.template  ../ethereal
+	rm -f ethereal-dump-fields
+	ln ../ethereal ethereal-dump-fields
+	./ethereal-dump-fields | ./dfilter2pod $(srcdir)/ethereal.pod.template > ethereal.pod
+	rm -f ethereal-dump-fields
+

doc/configure.in

@@ -1,10 +0,0 @@
-# $Id: configure.in,v 1.1 1999/07/20 08:02:23 guy Exp $
-
-AC_INIT(dfilter2pod.in)
-
-dnl Checks for programs.
-AC_PATH_PROG(PERL_PATH, perl)
-
-AC_SUBST(PERL_PATH)
-
-AC_OUTPUT(dfilter2pod, [chmod +x dfilter2pod])