The branch, master has been updated via 3d4d6546eea9650b7f4c13bf3ef70b2f94c72694 (commit) from 41c7c70facf6c08a68a9f9958fa98cd85c76f1db (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 3d4d6546eea9650b7f4c13bf3ef70b2f94c72694 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Dec 10 23:31:03 2013 +0100 some Makefile variable fixes ----------------------------------------------------------------------- Summary of changes: x2goadmincenter/Makefile | 4 ++-- x2goadminserver/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index af97670..82c2b60 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -38,7 +38,7 @@ build_admincenter: cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && qmake-qt4 $$module.pro && make; done + for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && $(QMAKE_BINARY) $$module.pro && make; done build_man: $(MAKE) -f Makefile.man2html build @@ -58,7 +58,7 @@ clean_plugins: rm -fr $(PLUGINS_DIR)/* clean_man: - make -f Makefile.man2html clean + $(MAKE) -f Makefile.man2html clean install: install_admincenter install_plugins install_man diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index 0d3d701..c8ae08e 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -28,12 +28,12 @@ build-arch: build-indep: build_man build_man: - make -f Makefile.man2html build + $(MAKE) -f Makefile.man2html build clean: clean_man clean_man: - make -f Makefile.man2html clean + $(MAKE) -f Makefile.man2html clean install: install_adminserver install_man hooks/post-receive -- x2goadmincenter.git (X2Go Administration Center) 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 "x2goadmincenter.git" (X2Go Administration Center).