From Didier Gautheron (bug 3121):

User srcdir in Makefiles for faq.py.

svn path=/trunk/; revision=26996
This commit is contained in:
Stig Bjørlykke 2008-12-14 23:56:51 +00:00
parent f2dbebb885
commit adf9b77ac1
2 changed files with 4 additions and 4 deletions

View File

@ -787,7 +787,7 @@ else
SUBDIRS = tools wsutil wiretap doc epan packaging help @wireshark_SUBDIRS@
endif
FAQ: help/faq.txt help/faq.py
FAQ: help/faq.txt $(srcdir)/help/faq.py
(cd help ; \
$(MAKE) faq.txt ; \
cp faq.txt ../FAQ )

View File

@ -34,7 +34,7 @@ help_DATA = \
faq.txt \
overview.txt
EXTRA_DIST = $(help_DATA) Makefile.nmake faq.py
EXTRA_DIST = $(help_DATA) Makefile.nmake $(srcdir)/faq.py
CLEANFILES = faq.txt
@ -42,8 +42,8 @@ MAINTAINERCLEANFILES = \
Makefile.in
# Try our best to convert the FAQ to text.
faq.txt: faq.py
./faq.py >$@.tmp
faq.txt: $(srcdir)/faq.py
$(srcdir)/faq.py >$@.tmp
elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ || \
links -dump -width 72 -no-numbering -no-references < $@.tmp > $@ || \
lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@