This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit e2d59a4117cb38a14b2f5742c0d24ba9fbc64472
Author: Mihai Moldovan <io...@ionic.de>
Date: Tue Jul 31 00:48:16 2018 +0200
x2goserver-xsession/Makefile: consolidate a few entries.
---
debian/changelog | 1 +
x2goserver-xsession/Makefile | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 27882da..ed95e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium
[ Mihai Moldovan ]
* New upstream version (4.1.0.2):
- Makefile.PL: update version number.
+ - x2goserver-xsession/Makefile: consolidate a few entries.
* debian/rules:
+ Add support for perl/perl:any substitution variable based upon detected
OS version.
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index a834a6f..cae3dbf 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -56,10 +56,8 @@ install_config:
$(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/
if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ];
then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE)
$(DESTDIR)$(ETCDIR)/Xsession.options; else touch
$(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi
if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then
$(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi
- if [ -e /etc/redhat-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/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/redhat-release ] || [ -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/redhat-release ] || [ -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 || [ -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 /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goserver.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
