hardcode /bin/sh to idl2wrs
authorrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 22 Nov 2011 13:53:06 +0000 (13:53 +0000)
committerrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 22 Nov 2011 13:53:06 +0000 (13:53 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39984 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
configure.in
debian/rules
tools/Makefile.am
tools/idl2wrs [moved from tools/idl2wrs.sh.in with 99% similarity, mode: 0755]

index 29eb97f8775ce9010fcf43e9afd706c0b9277725..7e4c42c304c44c76e546370b102343fe5e8bac26 100644 (file)
@@ -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.*
 
index 77aef63bdc021835432e5ec2f1d286ee214671f1..beb3b8d1f37d0bf5b8de4deba18b60ee416a5f0e 100644 (file)
@@ -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"
index 0d9eb14b481007e35b9f3da3c02214e4d7cc65d1..7e3a3b8998056644bd411da37e4e1716db3b1d32 100755 (executable)
@@ -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/
index c4d22d27fc71eabd6c07df49dd061f7071e533ae..de479267767e9afc77bec12c16194b1d1bd57140 100644 (file)
@@ -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                           \
old mode 100644 (file)
new mode 100755 (executable)
similarity index 99%
rename from tools/idl2wrs.sh.in
rename to tools/idl2wrs
index ec3a4cf..478965c
@@ -1,4 +1,4 @@
-#! @SHELL@
+#!/bin/sh
 #
 #  $Id$
 #