[X2Go-Commits] [x2goclient] 01/01: Makefile.man2html: Test if man2html exists. If not, don't fail.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3c1989b4c5483b3e13e19fc3093118f044c7801f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 07:33:52 2014 +0200

    Makefile.man2html: Test if man2html exists. If not, don't fail.
---
 Makefile.man2html |   12 +++++++-----
 debian/changelog  |    1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.man2html b/Makefile.man2html
index abe7a32..3412768 100644
--- a/Makefile.man2html
+++ b/Makefile.man2html
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-MAN2HTML_BIN = man2html
+MAN2HTML_BIN = $(shell which man2html)
 MAN2HTML_SRC   = man
 BUILD_DIR = .build_man2html
 MAN2HTML_DEST = $(BUILD_DIR)/html
@@ -12,11 +12,13 @@ all: build
 build: build_man2html
 
 build_man2html:
-	mkdir -p $(MAN2HTML_DEST)
-	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
-	for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+	if [ -n "$(MAN2HTML_BIN)" ]; then \
+	    mkdir -p $(MAN2HTML_DEST); \
+	    for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \
+	    for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \
+	fi
 
 clean: clean_man2html
 
 clean_man2html:
-	rm -Rf $(BUILD_DIR)
\ No newline at end of file
+	rm -Rf $(BUILD_DIR)
diff --git a/debian/changelog b/debian/changelog
index e96039a..ccd72cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Update translation files. Add empty Portuguese translation. Update
       qt_<lang>.qm files from Debian unstable as of today.
     - Update German translation file (after session folder feature got added).
+    - Makefile.man2html: Test if man2html exists. If not, don't fail.
   * debian/control:
     + Add B-D: apache2-dev. On squeeze / lucid builds, this is a superfluous
       B-D, but for later Debian/Ubuntu versions, this smoothes the installation

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git