Makefile.nx-libs: Install man pages via main Makefile.

10 files changed, 17 insertions, 6 deletions

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index cd0a4e95c..a60dc7b77 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -65,6 +65,11 @@ install-lite:
 	for d in nxcomp nxproxy; do \
 	   $(MAKE) -C $$d install; done
 
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
+	$(INSTALL_FILE) nxproxy/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
+	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+
+
 install-full:
 	for f in nxagent nxauth x2goagent; do \
 	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
@@ -88,6 +93,13 @@ install-full:
 	$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin
 	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin
 
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
+	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
+	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
+	$(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/
+	mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1
+	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+
 	# create a clean nx-X11/.build-exports space
 	rm -Rf nx-X11/.build-exports
 	mkdir -p nx-X11/.build-exports/include
diff --git a/debian/changelog b/debian/changelog
index 85fbb37b2..939402143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
   * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
     Fix several typos in upstream code detected by lintian.
   * Makefile.nx-libs: Don't allow symlinks to point into buildroot.
+  * Makefile.nx-libs: Install man pages via main Makefile.
   * Add Description: and Author: fields to various patch headers.
 
   * NX code reduction efforts (from 93Mb to 41Mb):
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 4556ee7db..eaaa847e9 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,6 +1,7 @@
 etc/nxagent/keystrokes.cfg
 etc/nxagent/rgb
 usr/share/nx/rgb
+usr/share/man/man1/nxagent.1*
 usr/lib/nx/bin/nxagent
 usr/bin/nxagent
 usr/share/pixmaps/nxagent.xpm
diff --git a/debian/nxagent.manpages b/debian/nxagent.manpages
deleted file mode 100644
index 681002a37..000000000
--- a/debian/nxagent.manpages
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
diff --git a/debian/nxauth.install b/debian/nxauth.install
index 9c5db00da..eefba46b9 100644
--- a/debian/nxauth.install
+++ b/debian/nxauth.install
@@ -1,2 +1,3 @@
 usr/lib/nx/bin/nxauth
 usr/bin/nxauth
+usr/share/man/man1/nxauth.1*
diff --git a/debian/nxauth.manpages b/debian/nxauth.manpages
deleted file mode 100644
index 71592e689..000000000
--- a/debian/nxauth.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-nx-X11/programs/nxauth/nxauth.man
-
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index c7f7589b0..5a55a9825 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,3 @@
 usr/lib/nx/bin/nxproxy
 usr/bin/nxproxy
-usr/share/man/man1/nxproxy.1
+usr/share/man/man1/nxproxy.1*
diff --git a/debian/nxproxy.manpages b/debian/nxproxy.manpages
deleted file mode 100644
index 8564de803..000000000
--- a/debian/nxproxy.manpages
+++ /dev/null
@@ -1 +0,0 @@
-nxproxy/man/nxproxy.1
diff --git a/debian/x2goagent.install b/debian/x2goagent.install
index ad6b1d8c9..9ef17d9c6 100644
--- a/debian/x2goagent.install
+++ b/debian/x2goagent.install
@@ -2,6 +2,7 @@ usr/bin/x2goagent
 usr/lib/x2go/bin/x2goagent
 usr/share/pixmaps/x2go.xpm
 usr/share/x2go/rgb
+usr/share/man/man1/x2goagent.1*
 etc/x2go/rgb
 usr/share/x2go/versions/VERSION.x2goagent
 etc/x2go/keystrokes.cfg
diff --git a/debian/x2goagent.manpages b/debian/x2goagent.manpages
deleted file mode 100644
index 2a8850e0c..000000000
--- a/debian/x2goagent.manpages
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1