[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-159-g31076ba

X2Go dev team git-admin at x2go.org
Mon May 20 21:54:42 CEST 2013 

The branch, master has been updated
       via  31076ba44b343af2616db1e116f10feaa04de08b (commit)
      from  da78814254872c8d400aea80aff6f63f7ef08d10 (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 31076ba44b343af2616db1e116f10feaa04de08b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 20 21:54:08 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                |    8 ++++++++
 libx2go-server-db-perl/Makefile |    4 ++--
 x2goserver-common/Makefile      |    2 +-
 x2goserver-compat/Makefile      |    2 +-
 x2goserver-extensions/Makefile  |    2 +-
 x2goserver-fmbindings/Makefile  |    2 +-
 x2goserver-printing/Makefile    |    2 +-
 x2goserver-pyhoca/Makefile      |    2 +-
 x2goserver-xsession/Makefile    |    2 +-
 x2goserver/Makefile             |    2 +-
 11 files changed, 19 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index c96b24f..e520fe4 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 43a974b..3db6fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
+x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low
+ 
+  * 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 at das-netzwerkteam.de>  Sun, 19 May 2013 15:02:53 +0200
+
 x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low
 
   [ Matthew L. Dailey ]
diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile
index 3c6a003..93914aa 100755
--- a/libx2go-server-db-perl/Makefile
+++ b/libx2go-server-db-perl/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
@@ -39,7 +39,7 @@ all: clean build
 build: build-arch build-indep
 
 build-arch:
-	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper.pl\" -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/libx2go-server-db-sqlite3-wrapper.pl\" -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c
 
 build-indep:
 
diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile
index 0f67ff4..b7b9d10 100755
--- a/x2goserver-common/Makefile
+++ b/x2goserver-common/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index 3775dae..b2cb141 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 41f6487..ff5563a 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index c90179a..6f26a55 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index 3900717..0f258fe 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile
index b8ecfa8..d168617 100755
--- a/x2goserver-pyhoca/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -10,7 +10,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
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 23f1c93..4fe806d 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -11,7 +11,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
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index f2d6d7a..c7ced06 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -10,7 +10,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


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).

More information about the x2go-commits mailing list