[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-257-g4782010

[X2Go dev team]

The branch, build-main has been updated
       via  4782010113b7e267ef7404da7179a9c3c6289dbf (commit)
      from  6aefbf4538b55ca5dc3c5748238b0203f9db180c (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:
 debian/changelog           |    3 +++
 x2goserver-compat/Makefile |    8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5d7d515..1b9f5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     actions.
   * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out.
 
+  [ Ivan Kabaivanov ]
+  * Makefile fix around man page installation in x2goserver-compat package.
+
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
 
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index b6651c5..470dde7 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -66,9 +66,9 @@ install_config:
 
 install_man:
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
-	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_FILE) man/man1/*.1           $(DESTDIR)$(MANDIR)/man1
-	gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1
+	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL_FILE) man/man1/*.8           $(DESTDIR)$(MANDIR)/man8
+	gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8
 
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
@@ -91,8 +91,6 @@ uninstall_config:
 #	$(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) || 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).