Addl fix 736: Please migrate from gnome-doc-tool to yelp-build

https://github.com/BestImageViewer/geeqie/issues/736

Do not force user to create help files.

diff --git a/README.md b/README.md
index d4fd977..c8b1fcc 100644 (file)
--- a/README.md
+++ b/README.md
@@ -240,13 +240,6 @@ And either the ChangeLog file or [Geeqie ChangeLog](http://geeqie.org/cgi-bin/gi
         for displaying pdf files
         disable with configure option: --disable-pdf
 
-    ZoneDetect
-        For displaying timezone and UTC/DST time offset
-        Download file:
-        https://github.com/BertoldVdb/ZoneDetect/raw/master/database/timezone21.bin
-        and copy to the location of the Geeqie ancilliary files, which is usually:
-        /usr/local/lib/geeqie/
-
     libimage-exiftool-perl
         For the jpeg extraction plugin
 
@@ -272,6 +265,9 @@ And either the ChangeLog file or [Geeqie ChangeLog](http://geeqie.org/cgi-bin/gi
     libopenjp2
         For displaying JP2 images
 
+    yelp-tools
+        For creating the Help files
+
 ### Code hackers:
 
 If you plan on making any major changes to the code that will be offered for

diff --git a/autogen.sh b/autogen.sh
index 3e247c4..9a32605 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,13 +58,6 @@ test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   DIE=1
 }
 
-GNOMEDOC=`which yelp-build`
-if test -z $GNOMEDOC; then
-  echo "*** The tools to build the documentation are not found,"
-  echo "    please intall the yelp-tool package ***"
-  DIE=1
-fi
-
 if test "$DIE" -eq 1; then
   exit 1
 fi

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 54b442d..3d044bd 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,7 +9,7 @@ html/GuideIndex.html: docbook/GuideIndex.xml
        if [ -x "$(GNOME_DOC_TOOL)" ]; then \
                "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
        else \
-               echo "gnome-doc-tool not found, html is not built" ; \
+               echo "yelp-tools not found, html is not built" ; \
        fi
 
 html: html/GuideIndex.html
@@ -26,4 +26,3 @@ uninstall-hook:
 
 clean-local:
        rm -rf html
-