Inspired by a discussion on this list, I've done a patch to create a
ethereal-filter.4 manpage that contains the display filters.
Things build fine, but "make distcheck" fails like this:
...
sed -e 's,@''SHELL''@,/bin/sh,g' ../idl2eth.sh > idl2eth.tmp && chmod +x idl2eth.tmp && mv idl2eth.tmp idl2eth
(cd doc ; \
make ../ethereal.1 )
make[4]: Entering directory `/home/jmayer/work/ethereal/ethereal/ethereal-0.9.15/_build/doc'
/usr/bin/pod2man \
--center="The Ethereal Network Analyzer" \
--release=0.9.15 \
ethereal.pod > ../ethereal.1
Can't open ethereal.pod for reading: No such file or directory
at /usr/bin/pod2man line 60
make[4]: *** [../ethereal.1] Error 255
make[4]: Leaving directory `/home/jmayer/work/ethereal/ethereal/ethereal-0.9.15/_build/doc'
...
The makefile/configure stuff of the patch is attached. Ideas what I did wrong?
If it's easier, I can check in the whole patch as soon as I've done the changes
to Makefile.nmake and hope someone has an idea before the next release ;-)
Ciao
Jörg
--
Joerg Mayer <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ethereal/Makefile.am,v
retrieving revision 1.631
diff -u -p -r1.631 Makefile.am
--- Makefile.am 26 Sep 2003 22:20:06 -0000 1.631
+++ Makefile.am 29 Sep 2003 23:17:36 -0000
@@ -63,6 +63,7 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
bin_PROGRAMS = @ethereal_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
bin_SCRIPTS = @idl2eth_bin@
man1_MANS = @ethereal_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
+man4_MANS = @etherealfilter_man@
man_MANS =
EXTRA_PROGRAMS = ethereal tethereal editcap mergecap dftest text2pcap
@@ -1128,11 +1129,12 @@ EXTRA_DIST = \
doc/README.tvbuff \
doc/dfilter2pod.pl \
doc/editcap.pod \
- doc/ethereal.pod.template \
+ doc/ethereal-filter.pod.template \
+ doc/ethereal.pod \
doc/idl2eth.pod \
doc/mergecap.pod \
doc/randpkt.txt \
- doc/tethereal.pod.template \
+ doc/tethereal.pod \
doc/text2pcap.pod \
editcap.c \
ethereal_be.py \
@@ -1226,13 +1228,17 @@ else
SUBDIRS = tools wiretap doc epan packaging @ethereal_SUBDIRS@
endif
-ethereal.1: ethereal doc/ethereal.pod.template
+ethereal.1: ethereal doc/ethereal.pod
(cd doc ; \
$(MAKE) ../ethereal.1 )
-tethereal.1: tethereal doc/tethereal.pod.template
+tethereal.1: tethereal doc/tethereal.pod
(cd doc ; \
$(MAKE) ../tethereal.1 )
+
+ethereal-filter.4: tethereal doc/ethereal-filter.pod.template
+ (cd doc ; \
+ $(MAKE) ../ethereal-filter.4 )
editcap.1: doc/editcap.pod
(cd doc ; \
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ethereal/configure.in,v
retrieving revision 1.222
diff -u -p -r1.222 configure.in
--- configure.in 20 Sep 2003 10:06:40 -0000 1.222
+++ configure.in 29 Sep 2003 23:17:36 -0000
@@ -324,12 +324,14 @@ AC_ARG_ENABLE(tethereal,
if test "x$enable_tethereal" = "xyes" ; then
tethereal_bin="tethereal"
tethereal_man="tethereal.1"
+ etherealfilter_man="ethereal-filter.4"
else
tethereal_bin=""
tethereal_man=""
fi
AC_SUBST(tethereal_bin)
AC_SUBST(tethereal_man)
+AC_SUBST(etherealfilter_man)
Index: doc/Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ethereal/doc/Makefile.am,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.am
--- doc/Makefile.am 27 Feb 2003 00:09:53 -0000 1.17
+++ doc/Makefile.am 29 Sep 2003 23:17:37 -0000
@@ -30,17 +30,20 @@
--release=$(VERSION) \
ethereal.pod > ../ethereal.1
-ethereal.pod: ethereal.pod.template ../ethereal
- ../ethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal.pod.template > ethereal.pod
-
../tethereal.1: tethereal.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
tethereal.pod > ../tethereal.1
-tethereal.pod: tethereal.pod.template ../tethereal
- ../tethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/tethereal.pod.template > tethereal.pod
+../ethereal-filter.4: ethereal-filter.pod ../config.h
+ $(POD2MAN) \
+ --center="The Ethereal Network Analyzer" \
+ --release=$(VERSION) \
+ ethereal-filter.pod > ../ethereal-filter.4
+
+ethereal-filter.pod: ethereal-filter.pod.template ../tethereal
+ ../tethereal -G fields | $(PERL) ../dfilter2pod.pl ../ethereal-filter.pod.template > ethereal-filter.pod
../editcap.1: editcap.pod ../config.h
$(POD2MAN) \
@@ -66,9 +69,11 @@ tethereal.pod: tethereal.pod.template .
--release=$(VERSION) \
$(srcdir)/text2pcap.pod > ../text2pcap.1
-CLEANFILES = \
- ethereal.pod \
- tethereal.pod \
+CLEANFILES = \
+ ethereal-filter.pod \
+ ../ethereal-filter.4 \
+ ../ethereal.1 \
+ ../tethereal.1 \
../ethereal.1 \
../editcap.1 \
../mergecap.1 \
