[X2Go-Commits] [x2goserver] 04/04: Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d).
git-admin at x2go.org
git-admin at x2go.org
Mon Oct 13 16:03:56 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 0a8db775d02f053e7e5a959e24dd758474664ee4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Oct 13 16:02:39 2014 +0200
Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d).
---
debian/changelog | 2 ++
x2goserver-xsession/Makefile | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 13800fd..b1dee2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
purpose do not recursively dive into the complete subtree. (Fixes: #633).
- Make man2html an optional tool. Don't fail if it is missing on the
build system (required for openSUSE/SLES builds).
+ - Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create
+ Xsession related directory symlinks (xinitrc.d and Xclients.d).
* debian/control:
+ Add D (x2goserver): libfile-which-perl.
* x2goserver.spec:
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index ee8757b..d1ebffc 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -60,6 +60,8 @@ install_config:
if [ -e /etc/redhat-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi
if [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
if [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi
+ if [ -e /etc/SUSE-brand ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
+ if [ -e /etc/SUSE-brand ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi
install_man:
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list