[X2Go-Commits] [x2goserver] 01/01: Hack for x2goserver-xsession/Makefile during SUSE builds. If directoy /usr/share/doc/packages/brp-check-suse is present, the build env is also considered to be a SUSE system.
git-admin at x2go.org
git-admin at x2go.org
Mon Oct 13 16:40: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 d4df2001fcf2c1d1e1d2298976ab6b7cea197de7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Oct 13 16:40:40 2014 +0200
Hack for x2goserver-xsession/Makefile during SUSE builds. If directoy /usr/share/doc/packages/brp-check-suse is present, the build env is also considered to be a SUSE system.
---
debian/changelog | 3 +++
x2goserver-xsession/Makefile | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b8ae7a6..7f8126a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
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).
+ - Hack for x2goserver-xsession/Makefile during SUSE builds. If
+ directoy /usr/share/doc/packages/brp-check-suse is present, the build env
+ is also considered to be a SUSE system.
- Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for
SUSE system recognition).
* debian/control:
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 43f584e..a834a6f 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -60,7 +60,7 @@ 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/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
+ if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.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