summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-09-15 23:01:12 +0000
committerGuy Harris <guy@alum.mit.edu>2001-09-15 23:01:12 +0000
commitdcb2bdf420066a5657b94163c16ecddf10317d07 (patch)
tree1c28263ee5f23235f1003ffa7a11f95245b267b4
parentbcc16a58c946b68a655aef2647659a027b6fe10b (diff)
downloadwireshark-dcb2bdf420066a5657b94163c16ecddf10317d07.tar.gz
Generate "idl2eth" from "idl2eth.sh", filling in the pathname for the
shell. (This also arranges that the source to "idl2eth" - which is now "idl2eth.sh" - not be deleted by "make clean"). Add "doc/idl2eth.pod" to the list of files in a source tarball. svn path=/trunk/; revision=3940
-rw-r--r--Makefile.am23
-rw-r--r--[-rwxr-xr-x]idl2eth.sh (renamed from idl2eth)4
2 files changed, 22 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 0709cca0f3..405a50d898 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.365 2001/09/10 22:06:33 guy Exp $
+# $Id: Makefile.am,v 1.366 2001/09/15 23:01:12 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -60,11 +60,13 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
# automake will arrange that the Makefile define it as the union of all
# the "man{section}_MANS" variables.
#
-bin_PROGRAMS = @ethereal_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@ @idl2eth_bin@
+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@
man_MANS =
EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap mergecap dftest text2pcap
+EXTRA_SCRIPTS = idl2eth
sysconf_DATA = manuf
@@ -632,6 +634,17 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
$(PERL) $(srcdir)/process-x11-fields.pl <$(srcdir)/x11-fields
#
+# Build shell scripts by doing variable substitution.
+# Taken from autoconf 2.13.
+#
+editsh = sed -e 's,@''SHELL''@,$(SHELL),g'
+
+SUFFIXES = .sh
+.sh:
+ rm -f $@ $@.tmp
+ $(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
+
+#
# Build "register.c", which contains a function "register_all_protocols()"
# that calls the register routines for all protocols.
#
@@ -703,6 +716,9 @@ dftest_LDADD = \
dftest_LDFLAGS = -export-dynamic
+CLEANFILES = \
+ idl2eth
+
DISTCLEANFILES = \
register.c \
register-static.c \
@@ -738,6 +754,7 @@ EXTRA_DIST = \
doc/dfilter2pod.pl \
doc/editcap.pod \
doc/ethereal.pod.template \
+ doc/idl2eth.pod \
doc/mergecap.pod \
doc/randpkt.txt \
doc/tethereal.pod.template \
@@ -751,7 +768,7 @@ EXTRA_DIST = \
text2pcap-scanner.l \
getopt.c \
getopt.h \
- idl2eth \
+ idl2eth.sh \
ieee-float.h \
image/Makefile.nmake \
image/editcap.rc.in \
diff --git a/idl2eth b/idl2eth.sh
index 2c5e2a8a91..75b6c633d3 100755..100644
--- a/idl2eth
+++ b/idl2eth.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#! @SHELL@
#
-# $Id: idl2eth,v 1.2 2001/09/04 21:06:58 guy Exp $
+# $Id: idl2eth.sh,v 1.1 2001/09/15 23:01:12 guy Exp $
#
# File : idl2eth
#