From: Rob Norris <rw_norris@hotmail.com>
Date: Sat, 9 Feb 2013 01:19:36 +0000 (+0000)
Subject: Restore help files to being part of the source distribution.
X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/d7603eb2d59fdb5da0cbc7705a4f5ae53ca8e08b

Restore help files to being part of the source distribution.

Ensure it works with make distcheck
---

diff --git a/Makefile.am b/Makefile.am
index 10bcbfc1..4a5a2708 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 # Optionally build documentation bits
 if VIKING_DOC
-	DO_DOCS = "help doc"
+	DO_DOCS = "doc"
 endif
-SUBDIRS = src test data po win32 $(DO_DOCS)
+SUBDIRS = src test data po win32 help $(DO_DOCS)
 
 INTLTOOL = \
 	intltool-extract.in \
diff --git a/configure.ac b/configure.ac
index 942937e5..ecae019b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,13 +352,13 @@ AC_CONFIG_FILES([
 		po/Makefile.in
 		data/Makefile
 		test/Makefile
+		help/Makefile
 		win32/Makefile
 		win32/installer/Makefile
 		win32/installer/pixmaps/Makefile
 		win32/installer/translations/Makefile])
 AM_COND_IF([VIKING_DOC],
 	[AC_CONFIG_FILES([
-		help/Makefile
 		doc/Makefile
 		doc/reference/Makefile
 		doc/examples/Makefile])])
diff --git a/help/Makefile.am b/help/Makefile.am
index ff969c35..be78069f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -5,7 +5,9 @@ include $(top_srcdir)/gnome-doc-utils.make
 # Nevertheless we need to copy the images into figures/ so they are available for the distribution installed help
 # Most tool icons are _18, except the pan one which is _22 just to be annoying
 get-icons:
-	cp -f ../src/icons/*_[12][0-9].png C/figures/
+	-cp -f ../src/icons/*_[12][0-9].png C/figures/
+# '-' ^^^^^ means it doesn't care about the exit status
+#  this copy statement is not critical (especially when run under make distcheck)
 
 dist-hook: get-icons doc-dist-hook