[X2Go-Commits] [x2goserver] 04/06: x2goserver-x2goagent/Makefile: install etc/rgb as in ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to ${DATADIR}/x2go/rgb.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/move-x2goagent-into-x2goserver
in repository x2goserver.

commit d09fff27f33e09cb107d20bbf19072349cb8da4f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 30 08:52:01 2016 +0200

    x2goserver-x2goagent/Makefile: install etc/rgb as in ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to ${DATADIR}/x2go/rgb.
---
 debian/changelog              |    3 +++
 x2goserver-x2goagent/Makefile |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 89d00b6..e20de59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
       would expect (defined () can only be used on scalar values.)
     - x2goserver/bin/x2gofeaturelist: whitespace only.
     - x2goserver-x2goagent/: rename share/x2go/rgb back to etc/rgb.
+    - x2goserver-x2goagent/Makefile: install etc/rgb as in
+      ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to
+      ${DATADIR}/x2go/rgb.
   * x2goserver.spec:
     - Only create session DB in x2goserver's post install script. Do use
       proper Requires(post) statements to make sure perl-X2Go-Server-DB and
diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile
index fa179ce..2cd30ee 100755
--- a/x2goserver-x2goagent/Makefile
+++ b/x2goserver-x2goagent/Makefile
@@ -64,9 +64,11 @@ install_data:
 	$(INSTALL_FILE) share/x2go/rgb $(DESTDIR)$(SHAREDIR)/
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
 	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
+	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
 
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)$(ETCDIR)/

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git