[X2Go-Commits] [x2goserver] 03/05: x2goserver-xsession/Makefile: support Tumbleweed with Xresources in /usr/etc.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 215240a20d286580b106896e4950836bd78ad1c4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 27 21:51:27 2023 +0100

    x2goserver-xsession/Makefile: support Tumbleweed with Xresources in /usr/etc.
---
 debian/changelog             | 2 ++
 x2goserver-xsession/Makefile | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 47efce12..5d7d9abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -420,6 +420,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       warnings in obs-build's spec file parser.
     - x2goserver-xsession/Makefile: drop useless use of cat, add debugging to
       see whether symlinks or a directory has been added.
+    - x2goserver-xsession/Makefile: support Tumbleweed with Xresources in
+      /usr/etc.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
     + Pull in base64 as a run-time dependency. We'll need it in scripts.
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 8825d884..d2cea16b 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -54,7 +54,14 @@ install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
 #       provide target dirs for X11 related symlinks
 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
+	# *SuSE moved this to /usr/etc for later releases (currently Tumbleweed).
+	# Prefer this location.
+	for xres_prefix in '/usr' '/'; do \
+		if [ -d "$${xres_prefix}/etc/X11/Xresources" ]; then \
+			$(INSTALL_SYMLINK) "$${xres_prefix}/etc/X11/Xresources"          $(DESTDIR)$(ETCDIR)/ ; \
+			break; \
+		fi; \
+	done
 	if [ -e /etc/debian_version ] || [ -e /etc/devuan_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 ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d; $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi
 	if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git