[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-160-g8894587
X2go dev team
git-admin at x2go.org
Thu Jul 28 16:42:18 CEST 2011
The branch, master has been updated
via 8894587f2790e9e6bfd4977841823226ad8025ed (commit)
from 21f1f4263d61c2900ea873783b43104f7484838f (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 8894587f2790e9e6bfd4977841823226ad8025ed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 28 16:42:28 2011 +0200
more Makefile fixes related to man pages.
-----------------------------------------------------------------------
Summary of changes:
x2goserver-compat/Makefile | 2 ++
x2goserver-extensions/Makefile | 4 +++-
x2goserver/Makefile | 2 ++
3 files changed, 7 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index dd04574..a4f7de6 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -91,6 +91,8 @@ uninstall_config:
# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
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)
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 6ece71f..66fc672 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -68,7 +68,7 @@ install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
$(INSTALL_FILE) man/man8/*.1 $(DESTDIR)$(MANDIR)/man1
- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.1
+ gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1
install_version:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
@@ -91,6 +91,8 @@ uninstall_config:
# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
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)
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index ad8fd61..0c3fdc1 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -100,6 +100,8 @@ uninstall_config:
$(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
uninstall_man:
+ for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.1.gz; done
+ for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$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)
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