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

[X2go dev team]

The branch, master has been updated
       via  8e13d1f451fd78e20e7a397c73ff28887c9ff9e2 (commit)
      from  10f33fa7ee2461f6a9b252afa0f892dbca8c8e7b (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 8e13d1f451fd78e20e7a397c73ff28887c9ff9e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 17:03:57 2011 +0200

    changing uninstall order of components, making uninstallation more robust

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

Summary of changes:
 Makefile            |    4 ++--
 x2goserver/Makefile |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 9487a51..da4beb4 100755
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ install:
 	cd x2goserver-extensions && make $@
 
 uninstall:
-	cd x2goserver && make $@
-	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
+	cd x2goserver-compat && make $@
+	cd x2goserver && make $@
 
 
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 092894a..12bf4cd 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -99,9 +99,9 @@ uninstall_scripts:
 uninstall_config:
 	$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
 	$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
-	$(RM_DIR)  $(DESTDIR)$(ETCDIR)
-	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords
-	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql
+	$(RM_DIR)  $(DESTDIR)$(ETCDIR) || true
+	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true
+	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql || true
 
 uninstall_man:
 	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.1.gz; done


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).