Hi x2goserver's current git still has a bug when installing the man pages. Patch follows: --- x2goserver/Makefile.original 2011-09-10 14:42:04.000000000 +0300 +++ x2goserver/Makefile 2011-09-10 14:43:02.000000000 +0300 @@ -66,9 +66,9 @@ 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/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) @@ -91,8 +91,8 @@ # $(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 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 IvanK.
Hi Ivan, On Sa 10 Sep 2011 14:21:31 CEST Ivan Kabaivanov wrote:
Hi
x2goserver's current git still has a bug when installing the man pages. Patch follows:
--- x2goserver/Makefile.original 2011-09-10 14:42:04.000000000 +0300 +++ x2goserver/Makefile 2011-09-10 14:43:02.000000000 +0300 @@ -66,9 +66,9 @@
install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1$(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8$(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) @@ -91,8 +91,8 @@ # $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true
uninstall_man:
for file in $(BIN_SCRIPTS); do $(RM_FILE)for file in $(SBIN_SCRIPTS); do $(RM_FILE)
for file in $(BIN_SCRIPTS); do $(RM_FILE)for file in $(SBIN_SCRIPTS); do $(RM_FILE)
I just took a look and committed a patch that is slightly different from yours. Could you please cross check that last commit? Thanks, Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Saturday 10 September 2011 14:38:50 Mike Gabriel wrote:
--- x2goserver/Makefile.original 2011-09-10 14:42:04.000000000 +0300 +++ x2goserver/Makefile 2011-09-10 14:43:02.000000000 +0300
I just took a look and committed a patch that is slightly different from yours. Could you please cross check that last commit?
Thanks, Mike
Mike,
I now realize I sent the wrong patch. It should be applied to x2goserver/x2goserver-compat/Makefile.
To make sure I just pulled a fresh git checkout and the problem is still there.
IvanK.
Hi Ivan,
On Sa 10 Sep 2011 15:11:27 CEST Ivan Kabaivanov wrote:
On Saturday 10 September 2011 14:38:50 Mike Gabriel wrote:
--- x2goserver/Makefile.original 2011-09-10 14:42:04.000000000 +0300 +++ x2goserver/Makefile 2011-09-10 14:43:02.000000000 +0300
I just took a look and committed a patch that is slightly different from yours. Could you please cross check that last commit?
Thanks, Mike
Mike,
I now realize I sent the wrong patch. It should be applied to x2goserver/x2goserver-compat/Makefile.
To make sure I just pulled a fresh git checkout and the problem is still there.
IvanK.
Please try again... Uploaded more patches.
Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Saturday 10 September 2011 15:51:34 Mike Gabriel wrote:
Hi Ivan,
Please try again... Uploaded more patches.
Mike
Mike,
still needs a bit of tweaking:
install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) man/man1/*.8 $(DESTDIR)$(MANDIR)/man8 gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8
notice the man1. Should be man8.
IvanK.
-
Ivan Kabaivanov -
Mike Gabriel