hardcode /bin/sh to idl2wrs

svn path=/trunk/; revision=39984

5 files changed, 4 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index 29eb97f877..7e4c42c304 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,15 +47,10 @@ bin_PROGRAMS = \
 	@dftest_bin@	\
 	@dumpcap_bin@	\
 	@rawshark_bin@
-bin_SCRIPTS = @idl2wrs_bin@
 
 EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
 	randpkt text2pcap dumpcap rawshark
-EXTRA_SCRIPTS = idl2wrs
-
-idl2wrs: tools/idl2wrs.sh Makefile
-	cp tools/idl2wrs.sh idl2wrs
-	chmod +x idl2wrs
+EXTRA_SCRIPTS = tools/idl2wrs
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
@@ -529,7 +524,6 @@ services: tools/make-services.pl
 	$(PERL) $(srcdir)/tools/make-services.pl
 
 CLEANFILES =		\
-	idl2wrs		\
 	*~		\
 	vgcore.*
 
diff --git a/configure.in b/configure.in
index 77aef63bdc..beb3b8d1f3 100644
--- a/configure.in
+++ b/configure.in
@@ -2017,7 +2017,6 @@ AC_OUTPUT(
   plugins/wimax/Makefile
   plugins/wimaxasncp/Makefile
   tools/Makefile
-  tools/idl2wrs.sh
   tools/lemon/Makefile
   wiretap/Makefile
   wsutil/Makefile
@@ -2120,7 +2119,6 @@ echo "                      Build editcap : $enable_editcap"
 echo "                      Build dumpcap : $enable_dumpcap"
 echo "                     Build mergecap : $enable_mergecap"
 echo "                    Build text2pcap : $enable_text2pcap"
-echo "                      Build idl2wrs : $enable_idl2wrs"
 echo "                      Build randpkt : $enable_randpkt"
 echo "                       Build dftest : $enable_dftest"
 echo "                     Build rawshark : $enable_rawshark"
diff --git a/debian/rules b/debian/rules
index 0d9eb14b48..7e3a3b8998 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
 	cp debian/wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/
-	cp tools/idl2wrs.sh $(CURDIR)/debian/tmp/usr/bin/
+	cp tools/idl2wrs $(CURDIR)/debian/tmp/usr/bin/
 	#cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
 	cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c4d22d27fc..de47926776 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -98,8 +98,7 @@ EXTRA_DIST = \
 	ftsanity.py					\
 	fuzz-test.sh					\
 	html2text.py					\
-	idl2wrs.sh					\
-	idl2wrs.sh.in					\
+	idl2wrs						\
 	indexcap.py					\
 	lex.py						\
 	list_protos_in_cap.sh				\
diff --git a/tools/idl2wrs.sh.in b/tools/idl2wrs
index ec3a4cfa4c..478965c4d5 100644..100755
--- a/tools/idl2wrs.sh.in
+++ b/tools/idl2wrs
@@ -1,4 +1,4 @@
-#! @SHELL@
+#!/bin/sh
 #
 #  $Id$
 #