This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2d4a20fd9236a9fa6d70dbe0ca58c61649b8f117 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 15:00:19 2014 +0200 Make man2html an optional tool. Don't fail if it is missing on the build system (required for openSUSE/SLES builds). --- debian/changelog | 2 ++ x2goserver-common/Makefile | 10 ++++++---- x2goserver-extensions/Makefile | 10 ++++++---- x2goserver-fmbindings/Makefile | 10 ++++++---- x2goserver-printing/Makefile | 10 ++++++---- x2goserver/Makefile | 10 ++++++---- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fec775..92499a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - x2gogetapps: Support scanning of sub-directories when searching for .desktop files. We allow to dive down one level into subdirs, we on purpose do not recursively dive into the complete subtree. (Fixes: #633). + - Make man2html an optional tool. Don't fail if it is missing on the + build system (required for openSUSE/SLES builds). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index bbbc76e..40b9dd9 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -26,7 +26,7 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html @@ -39,9 +39,11 @@ build-arch: build-indep: 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-arch clean-indep diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index c28d749..e84f0ea 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -23,7 +23,7 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html @@ -36,9 +36,11 @@ build-arch: build-indep: 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 diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 1d4f1dd..9e4c983 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -23,7 +23,7 @@ FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html @@ -36,9 +36,11 @@ build-arch: build-indep: 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 diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index d7ff4a3..6b6743e 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -24,7 +24,7 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html @@ -37,9 +37,11 @@ build-arch: build-indep: 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 diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 451e593..ee1891c 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -26,7 +26,7 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man MAN2HTML_DEST = .build_man2html/html @@ -39,9 +39,11 @@ build-arch: build-indep: 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-arch clean-indep -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git