This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit b9f2836244ff0d911876bb4fdb55d5cf1a0943b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 13:58:21 2017 +0200 x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass additional arguments to qmake. --- debian/changelog | 2 ++ x2goadmincenter/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a68cdb9..ac24ac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low [ Mihai Moldovan ] * Upstream version 0.0.0.1 (initial release): - Change string "X2go" to "X2Go" where appropriate. + - x2goadmincenter/Makefile: add QMAKE_OPTS variable to be able to pass + additional arguments to qmake. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile index bd3464b..6bd99c7 100755 --- a/x2goadmincenter/Makefile +++ b/x2goadmincenter/Makefile @@ -22,6 +22,7 @@ MANDIR=$(SHAREDIR)/man LIBDIR=$(PREFIX)/lib/x2goadmincenter QMAKE_BINARY=qmake-qt4 LRELEASE_BINARY=lrelease-qt4 +QMAKE_OPTS= all: build @@ -33,11 +34,11 @@ build-indep: build_man build_admincenter: $(LRELEASE_BINARY) x2goadmincenter.pro - mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goadmincenter.pro + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ${QMAKE_OPTS} ../x2goadmincenter.pro cd $(BUILD_DIR) && $(MAKE) build_plugins: - for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $$module.pro && make && cd - 1>/dev/null; done + for module in `ls $(CURDIR)/modules`; do cd $(CURDIR)/modules/$$module && $(LRELEASE_BINARY) $$module.pro && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ${QMAKE_OPTS} $$module.pro && make && cd - 1>/dev/null; done build_man: $(MAKE) -f Makefile.man2html build -- Alioth's /srv/git/code.x2go.org/x2goadmincenter.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git