[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-6-g31b58ab

[X2go dev team]

The branch, master has been updated
       via  31b58ab1c99513bf1ded60a213210cac0182615f (commit)
       via  905e1c5326ff61f9ce8bb4cb486e34adebe545df (commit)
      from  1f3c8dafa7f052840e45385ca07897b3d98cde72 (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 31b58ab1c99513bf1ded60a213210cac0182615f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 20 20:11:29 2011 +0100

    Makefile fix for x2goserver-xsession

commit 905e1c5326ff61f9ce8bb4cb486e34adebe545df
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 20 20:04:46 2011 +0100

    Makefile fix for x2goserver-extensions (2)

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

Summary of changes:
 x2goserver-extensions/Makefile |    2 +-
 x2goserver-xsession/Makefile   |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index f4b52ce..02a9525 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -76,7 +76,7 @@ install_scripts:
 	$(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/
 	$(INSTALL_FILE) lib/extensions/pre-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/
 	$(INSTALL_FILE) lib/extensions/post-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/
-	$(INSTALL_FILE) lib/extensions/post-fail.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/
+	$(INSTALL_FILE) lib/extensions/fail-resume.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/
 	$(INSTALL_FILE) lib/extensions/pre-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/
 	$(INSTALL_FILE) lib/extensions/post-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/
 	$(INSTALL_FILE) lib/extensions/fail-suspend.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index ec4a063..eb78e67 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -5,6 +5,7 @@ SHELL=/bin/bash
 
 INSTALL_DIR=install -d -o root -g root -m 755
 INSTALL_FILE=install -o root -g root -m 644
+INSTALL_SYMLINKK=ln -s -f
 INSTALL_PROGRAM=install -o root -g root -m 755
 
 RM_FILE=rm -f
@@ -62,7 +63,11 @@ install_scripts:
 
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
-	$(INSTALL_FILE) etc/*                   $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_FILE) etc/Xsession                    $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/Xresources
+	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/Xsession.d
+	$(INSTALL_SYMLINK) /etc/X11/Xsession.options    $(DESTDIR)$(ETCDIR)/Xsession.options
+
 
 install_man:
 #	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)


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