[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.9-5-gb94b429

X2go dev team git-admin at x2go.org
Mon Jan 23 18:20:40 CET 2012


The branch, master has been updated
       via  b94b429b96daf3afa71d83aca582a7de66f45495 (commit)
      from  835a18eeaca0e45002ad04ca0107de49fd268ad5 (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 b94b429b96daf3afa71d83aca582a7de66f45495
Author: John Williams <jwilliams4200 at gmail.com>
Date:   Mon Jan 23 18:20:34 2012 +0100

    Fix xserver-xsession/Makefile: add missing $(DESTDIR) expressions.

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

Summary of changes:
 debian/changelog             |    4 ++++
 x2goserver-xsession/Makefile |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1d27514..d44e1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.0.99.10):
     - Replace all string ,,X2Go.' with ,,X2Go''.
 
+  [ John Williams ]
+  * New upstream version (3.0.99.10):
+    - Fix xserver-xsession/Makefile: add missing $(DESTDIR) expressions.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 18 Jan 2012 14:43:21 +0100
 
 x2goserver (3.0.99.9-0~x2go1) unstable; urgency=low
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 2bbbd66..741ec99 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -64,9 +64,9 @@ install_scripts:
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
 #       provide target dirs for X11 related symlinks
-	mkdir -p /etc/X11/Xresources
-	mkdir -p /etc/X11/Xsession.d
-	touch /etc/X11/Xsession.options
+	mkdir -p $(DESTDIR)/etc/X11/Xresources
+	mkdir -p $(DESTDIR)/etc/X11/Xsession.d
+	touch $(DESTDIR)/etc/X11/Xsession.options
 	$(INSTALL_FILE) etc/Xsession                    $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/


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