[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-164-g77ddaaa

[X2go dev team]

The branch, master has been updated
       via  77ddaaadf052f596d9fa0dc935d44f658903a832 (commit)
       via  c3143081e6ddc46e86f858c082e41b96155aea60 (commit)
      from  51e8e40483b3fc4483889ea318b8034f4d826d51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 77ddaaadf052f596d9fa0dc935d44f658903a832
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 16:54:45 2011 +0200

    fix for setgid part in Makefile

commit c3143081e6ddc46e86f858c082e41b96155aea60
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 16:54:38 2011 +0200

    update of INSTALL file

-----------------------------------------------------------------------

Summary of changes:
 INSTALL             |   22 +++++++++++-----------
 x2goserver/Makefile |    4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index e037ed4..bcfde84 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,7 @@
 TARBALL INSTALLATION OF x2goserver
 ==================================
 
-1.) INSTALL x2goserver FILES
------------------------------
-Extract tarball and run 
-
- $ make install
-
-in base folder of the extracted tarball. 
-
-
-2.) USER + GROUP for X2go
+1.) USER + GROUP for X2go
 -------------------------
 Set up x2gouser account and its group if they do not exist
 already:
@@ -18,7 +9,16 @@ already:
  $ addgroup --system x2gouser
  $ adduser --system --no-create-home \
            --disabled-password --disabled-login \
-           --shell /bin/false --group x2gouser --home /var/lib/x2go x2gouser
+           --shell /bin/false --group --home /var/lib/x2go x2gouser
+
+2.) INSTALL x2goserver FILES
+-----------------------------
+Extract tarball and run 
+
+ $ make install
+
+in base folder of the extracted tarball. 
+
 
 3.) SUID GROUP
 --------------
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 72ad879..e886012 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -62,8 +62,8 @@ install_scripts:
 	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
 	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
 	$(INSTALL_FILE) lib/*                   $(DESTDIR)$(LIBDIR)/
-	chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
-	chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+	chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
+	chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
 
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)


hooks/post-receive
-- 
x2goserver.git (X2go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2go Server).