[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-205-g6a1a5cc

[X2Go dev team]

The branch, master has been updated
       via  6a1a5cce5c2b14956d36da9e72dd476e0e064f4a (commit)
      from  4fe465b30916b42bca6f2b4d84d68180eb3e99b6 (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 6a1a5cce5c2b14956d36da9e72dd476e0e064f4a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jul 30 22:22:58 2013 +0200

    Install Xsession file as executable, make Xsession.d directory location configurable during build process, do not create unused Xsession.options. (Fixes: #278).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 229c3cb..9e2ae03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,7 +55,9 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
 
   [ Orion Poplawski ]
   * New upstream version (4.0.1.7):
-    - Install Xsession file as executable.
+    - Install Xsession file as executable, make Xsession.d directory location
+      configurable during build process, do not create unused Xsession.options.
+      (Fixes: #278).
 
   [ Mike Gabriel ]
   * /debian/control:
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 98d16cc..c83d36d 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -20,6 +20,8 @@ LIBDIR=$(PREFIX)/lib/x2go
 MANDIR=$(PREFIX)/share/man
 SHAREDIR=$(PREFIX)/share/x2go
 
+XSESSIONDIR ?= /etc/X11/Xsession.d
+
 #BIN_SCRIPTS=$(shell cd bin && echo *)
 #SBIN_SCRIPTS=$(shell cd sbin && echo *)
 #LIB_FILES=$(shell cd lib && echo *)
@@ -56,12 +58,9 @@ install_scripts:
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
 #       provide target dirs for X11 related symlinks
-	mkdir -p $(DESTDIR)/etc/X11/Xsession.d
-	touch $(DESTDIR)/etc/X11/Xsession.options
 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_SYMLINK) /etc/X11/Xsession.options    $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_SYMLINK) $(XSESSIONDIR)               $(DESTDIR)$(ETCDIR)/Xsession.d
 
 
 install_man:


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