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 10bcbfc1b093f26e547d5edf7dc05553f57c2243..4a5a270832b749c89bc0195c73b91aa950af8d59 100644 (file)
--- 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 942937e5dce6527d18ae74c503b429cb11fd7ff9..ecae019b31dd05d2cf44e442e736e61dbbe4312d 100644 (file)
--- 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 ff969c35dd33e6f42953c61eca80376bf050d82f..be78069fa18b1e265d866a2354b8cb93cc978994 100644 (file)
--- 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