[X2Go-Commits] [x2goserver] 01/01: x2goserver-x2goagent/Makefile: fix left-over reference to share/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 master
in repository x2goserver.

commit ae3509b3125db5ce0e0f98ab19c193795d1a7b7e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 30 09:44:14 2016 +0200

    x2goserver-x2goagent/Makefile: fix left-over reference to share/x2go/rgb.
    
    It's back to etc/rgb now.
---
 debian/changelog              |    2 ++
 x2goserver-x2goagent/Makefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4381fb5..7842d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -161,6 +161,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
     - x2goserver-x2goagent/Makefile: install etc/rgb as in
       ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to
       ${DATADIR}/x2go/rgb.
+    - x2goserver-x2goagent/Makefile: fix left-over reference to
+      share/x2go/rgb. It's back to etc/rgb now.
   * 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 2cd30ee..8a42ac9 100755
--- a/x2goserver-x2goagent/Makefile
+++ b/x2goserver-x2goagent/Makefile
@@ -61,7 +61,7 @@ install_scripts:
 
 install_data:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
-	$(INSTALL_FILE) share/x2go/rgb $(DESTDIR)$(SHAREDIR)/
+	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
 	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
 	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/

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