[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.6-7-g8e2e6e9

[X2go dev team]

The branch, master has been updated
       via  8e2e6e98aa3fb772a4a2543b033ea40c98bea2f6 (commit)
       via  215a52f446e11be2014f004e0e2eba64bb05e458 (commit)
      from  dc8f38983f616d615d5112af43c871f5d17122bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e2e6e98aa3fb772a4a2543b033ea40c98bea2f6
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Feb 13 09:23:40 2012 +0100

    Use ,,${MAKE}'' instead of ,,make'' in Makefile.

commit 215a52f446e11be2014f004e0e2eba64bb05e458
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Feb 13 09:21:14 2012 +0100

    Use /cgi-bin/man/ path in web'ified man pages.

-----------------------------------------------------------------------

Summary of changes:
 Makefile          |    2 +-
 Makefile.man2html |    2 +-
 debian/changelog  |    5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 57ca900..28dcf9c 100755
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ build_plugin:
 	cd $(PLUGIN_DIR) && $(MAKE)
 
 build_man:
-	make -f Makefile.man2html build
+	${MAKE} -f Makefile.man2html build
 
 clean: clean_client clean_plugin clean_man
 	find . -type f -name '*.o' -exec rm -vf {} +
diff --git a/Makefile.man2html b/Makefile.man2html
index 97af6fe..abe7a32 100644
--- a/Makefile.man2html
+++ b/Makefile.man2html
@@ -14,7 +14,7 @@ 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) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+	for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
 
 clean: clean_man2html
 
diff --git a/debian/changelog b/debian/changelog
index 3ff5556..72ac861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.99.1.0):
     - Update German translation file (thanks to Stefan Baur).
+    - Use ,,${MAKE}'' instead of ,,make'' in Makefile.
+
+  [ Jan Engelhard ]
+  * New upstream version (3.99.1.0):
+    - Use /cgi-bin/man/ path in web'ified man pages.
 
   [ Oleksandr Shneyder ]
   * New upstream version (3.99.1.0):


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).