The branch, release/4.0.0.x has been updated via 2aabac70cc2137fe7e0377f6d2ac257841186507 (commit) from 52763c215a1575d7edbebcf482b06267fa82f1cf (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 2aabac70cc2137fe7e0377f6d2ac257841186507 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 20 21:52:42 2013 +0200 Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- debian/changelog | 4 +++- debian/rules | 2 +- x2goserver-compat/Makefile | 4 ++-- x2goserver-extensions/Makefile | 4 ++-- x2goserver-fmbindings/Makefile | 4 ++-- x2goserver-printing/Makefile | 4 ++-- x2goserver-pyhoca/Makefile | 4 ++-- x2goserver-xsession/Makefile | 4 ++-- x2goserver/Makefile | 4 ++-- 10 files changed, 19 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 588084f..3d575cb 100755 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go diff --git a/debian/changelog b/debian/changelog index 8990be3..56eb297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (4.0.0.3): + - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. + Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/debian/rules b/debian/rules index 5bb94b2..f71ab24 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,4 @@ override_dh_auto_clean: rm -fv x2gosqlitewrapper rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html - dh_auto_clean + PREFIX=/usr dh_auto_clean diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index d8a3c95..439ae59 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 13cf560..cc15e52 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 8661e83..ef9a5d3 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 1c956f4..8dc1339 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index 95ab06d..1d05bd5 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 50c2818..6ce7beb 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -11,8 +11,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go #BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e9d56e6..d324bc5 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -14,7 +14,7 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin @@ -41,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).