diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9f53d60935..eba1701a1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,6 @@ bin_PROGRAMS = \ EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \ randpkt text2pcap dumpcap rawshark -bin_SCRIPTS = tools/idl2wrs # # Wireshark configuration files are put in $(pkgdatadir). diff --git a/debian/rules b/debian/rules index 6d6a7ab2d5..4869053992 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +include /usr/share/dpatch/dpatch.make DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl @@ -52,7 +52,7 @@ clean: unpatch-stamp dh_testroot rm -f build-stamp configure-stamp - [ ! -f Makefile ] || $(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f rdps wireshark.1 tshark.1 wireshark-filter.4 rm -f conftest conftest.c rm -f config.guess config.sub config.log @@ -75,6 +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 $(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/ @@ -93,6 +94,7 @@ install: build done -rm -rf $(CURDIR)/debian/tmp/usr/man dh_installman + cp doc/idl2wrs.1 $(CURDIR)/debian/tmp/usr/man dh_movefiles dh_pysupport diff --git a/doc/Makefile.am b/doc/Makefile.am index 313ecf57a0..a7dfd83815 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -69,7 +69,6 @@ man1_MANS = \ @capinfos_man@ \ @editcap_man@ \ @dumpcap_man@ \ - idl2wrs.1 \ @rawshark_man@ \ @dftest_man@ \ @randpkt_man@ @@ -78,7 +77,7 @@ man_MANS = pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \ tshark.html wireshark-filter.html capinfos.html editcap.html \ - idl2wrs.html mergecap.html text2pcap.html dumpcap.html rawshark.html \ + mergecap.html text2pcap.html dumpcap.html rawshark.html \ dftest.html randpkt.html # |