[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-170-g13b418c
X2go dev team
git-admin at x2go.org
Thu Jul 28 17:10:56 CEST 2011
The branch, master has been updated
via 13b418c3d2424c40f954b600e284673181ba6a42 (commit)
from 63fa2bfa3f6c7c3959bfdeb99036e75795b4c59b (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 13b418c3d2424c40f954b600e284673181ba6a42
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 28 17:11:01 2011 +0200
making uinstall through Makefile even more robust
-----------------------------------------------------------------------
Summary of changes:
x2goserver-compat/Makefile | 12 ++++++------
x2goserver-extensions/Makefile | 12 ++++++------
x2goserver/Makefile | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
The diff of changes is:
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index a4f7de6..b6651c5 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -81,22 +81,22 @@ uninstall_scripts:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
-# $(RM_DIR) $(DESTDIR)$(LIBDIR)
+# $(RM_DIR) $(DESTDIR)$(LIBDIR) || true
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)/man1/$$file.1.gz; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
- $(RM_DIR) $(DESTDIR)$(MANDIR)
+ $(RM_DIR) $(DESTDIR)$(MANDIR) || true
uninstall_version:
$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index b8cb066..44d84b4 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -81,22 +81,22 @@ uninstall_scripts:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
-# $(RM_DIR) $(DESTDIR)$(LIBDIR)
+# $(RM_DIR) $(DESTDIR)$(LIBDIR) || true
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)/man1/$$file.1.gz; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
- $(RM_DIR) $(DESTDIR)$(MANDIR)
+ $(RM_DIR) $(DESTDIR)$(MANDIR) || true
uninstall_version:
$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 1e25fb5..6a82e6d 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -94,7 +94,7 @@ uninstall_scripts:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
- $(RM_DIR) $(DESTDIR)$(LIBDIR)
+ $(RM_DIR) $(DESTDIR)$(LIBDIR) || true
uninstall_config:
$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
@@ -108,8 +108,8 @@ uninstall_man:
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
- $(RM_DIR) $(DESTDIR)$(MANDIR)
+ $(RM_DIR) $(DESTDIR)$(MANDIR) || true
uninstall_version:
$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
- $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
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).
More information about the x2go-commits
mailing list