aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2009-02-03 08:49:03 +0000
committerJörg Mayer <jmayer@loplof.de>2009-02-03 08:49:03 +0000
commit5667e75a5027d29021aef93e777daf2d367a6252 (patch)
tree225a2d51ecc3430423ce467dcc8bca488eb46e36 /Makefile.am
parent043532d63e58e71e33016241b8330886655a3f27 (diff)
Get rid of FAQ file completely: It's still available as help/faq.txt
svn path=/trunk/; revision=27359
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 3 insertions, 5 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 ; \