From 65dea0d51ec33cbc614a3ec87b5aae28c86f005a Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 8 Dec 2015 15:56:13 +0100
Subject: [PATCH] Fix generation of help-pages-list file

---
 doc/automake.mk        | 4 ++--
 src/ui/gui/automake.mk | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/automake.mk b/doc/automake.mk
index 4e1b3ff349..b4d93ce1b3 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -61,7 +61,7 @@ $(srcdir)/doc/tut.texi:
 # The SED and AWK filters in this rule, are to work-around some nasty bugs in 
 # makeinfo version 4.13, which produces broken docbook xml.  These workarounds 
 # are rather horrible and must be removed asap.
-$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
 	@$(MKDIR_P)  doc
 	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
 		$(top_srcdir)/doc/pspp.texi -o - \
@@ -82,7 +82,7 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
 	 | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
 	> $@,tmp
 	$(AM_V_at)$(XMLLINT) --output /dev/null $@,tmp
-	$(AM_V_at)cat doc/help-pages-list | while read node ; do \
+	$(AM_V_at)cat $(top_srcdir)/doc/help-pages-list | while read node ; do \
 	 $(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
 	 if test $$? -ne 0 ; then  echo "$$node does not appear in $@" ; exit 1; fi ; \
 	 done 
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 63084c5e31..52cf9fe61a 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -53,10 +53,11 @@ UI_FILES = \
 	src/ui/gui/weight.ui
 
 
-$(srcdir)/doc/help-pages-list: $(UI_FILES)
-	 cat $^ | grep '"help-page"' | \
-   sed -e 's% *<property name="help-page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
+$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+	 cat $^ | grep '"help[-_]page"' | \
+   $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
 	-e 's%#%'"'"']/*[@id='"'"'%g' > $@
+
 EXTRA_DIST += doc/help-pages-list
 
 
-- 
2.30.2