Get rid of FAQ file completely: It's still available as help/faq.txt
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 3 Feb 2009 08:49:03 +0000 (08:49 +0000)
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 3 Feb 2009 08:49:03 +0000 (08:49 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27359 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
help/Makefile.am
packaging/rpm/SPECS/wireshark.spec.in

index c2cc41b4309df0d6f12515c532b61981dc64507b..dcb03ddffcb984dd4f7fe30032837d5e496e22b9 100644 (file)
@@ -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 ; \
index 3d3ffe02139cf82328ef1c22ef8c8dbc0f4c35ed..34c0c8910d8fc2c381d16bdef0fbb8311ccf84b3 100644 (file)
@@ -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
 
index c0bc9063c7a594e6baf51d68f95254983ee410f8..5e9032fbbb7400185cc86d215bb502a9c65ddc80 100644 (file)
@@ -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/*