From Didier Gautheron (bug 3121):

User srcdir in Makefiles for faq.py.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26996 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 785175155555a48bb2064a9f68c91db3202096aa..ef156f929ada9cc9d41d950304b43039e0084618 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 )

diff --git a/help/Makefile.am b/help/Makefile.am
index 7caf4df5b28884d361744509bc58b46193b1cbb1..7d2c866524505459984329a836fbc298a3104fe4 100644 (file)
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -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 > $@