[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-44-g497cc22
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:50:32 CET 2014
The branch, build-baikal has been updated
via 497cc223f35c5ad935d210d7343baabfa3f411e1 (commit)
from f694b1b0ec434427ae98c4bc5bde30de6242d6b9 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Makefile | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
The diff of changes is:
diff --git a/Makefile b/Makefile
index a9239a7..67027e1 100755
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib/x2go
+MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
@@ -24,23 +25,37 @@ LIB_FILES=$(shell cd lib && ls)
all:
-install:
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
+build:
+
+install: install_scripts install_config install_man install_version
+
+install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
$(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
$(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
+
+install_config:
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
$(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
$(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
- $(INSTALL_FILE) VERSION $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
-uninstall: uninstall_scripts uninstall_config uninstall_version
+install_man:
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+ gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
+ $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
+
+uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
uninstall_scripts:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
@@ -55,6 +70,11 @@ uninstall_config:
$(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
$(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+uninstall_man:
+ 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)
+
uninstall_version:
$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver
$(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions
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