diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | help/Makefile.am | 6 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index c2cc41b430..dcb03ddffc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,7 @@ idl2wrs: tools/idl2wrs.sh Makefile # # Wireshark configuration files are put in $(pkgdatadir). # -pkgdata_DATA = AUTHORS-SHORT COPYING FAQ manuf services wireshark.html \ +pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \ tshark.html wireshark-filter.html capinfos.html editcap.html \ idl2wrs.html mergecap.html text2pcap.html dumpcap.html \ rawshark.html ws.css cfilters colorfilters dfilters smi_modules @@ -573,7 +573,6 @@ MAINTAINERCLEANFILES = \ missing EXTRA_DIST = \ - FAQ \ INSTALL.configure \ Makefile.am.inc \ Makefile.common \ @@ -820,10 +819,9 @@ else SUBDIRS = tools wsutil wiretap doc epan packaging help @wireshark_SUBDIRS@ endif -FAQ help/faq.txt: $(srcdir)/help/faq.py +help/faq.txt: $(srcdir)/help/faq.py (cd help ; \ - $(MAKE) faq.txt ; \ - cp faq.txt ../FAQ ) + $(MAKE) faq.txt ;) wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT (cd doc ; \ diff --git a/help/Makefile.am b/help/Makefile.am index 3d3ffe0213..34c0c8910d 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -34,7 +34,11 @@ help_DATA = \ faq.txt \ overview.txt -EXTRA_DIST = $(help_DATA) Makefile.nmake $(srcdir)/faq.py +EXTRA_DIST = \ + $(help_DATA) \ + Makefile.nmake \ + $(srcdir)/faq.py \ + faq.txt CLEANFILES = faq.txt diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index c0bc9063c7..5e9032fbbb 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* %prefix/bin/* %prefix/lib/* %prefix/share/wireshark/* |