config: move man pages into their own directory

Use services provided by XORG_MANPAGE_SECTIONS.
Use standard Makefile for man pages.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

5 files changed, 21 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index 179d9f9..57753e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@
 
 # rstartd server
 
+SUBDIRS = man
 rstart_serverdir = $(libdir)/X11/rstart
 rstart_server_PROGRAMS = rstartd.real
 
@@ -72,28 +73,10 @@ rstartd: server.cpp
 	  -DLIBDIR=$(configdir) -DSERVERNAME=rstartd < ${srcdir}/server.cpp | \
 	  $(CPP_SED_MAGIC) > $@
 
-# man pages
-
-appmandir = $(APP_MAN_DIR)
-appman_PRE = rstartd.man rstart.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-      MANDEFS = -D__projectroot__=$(prefix) \
-	-D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-
-
-EXTRA_DIST = client.cpp server.cpp config.cpp $(appman_PRE)
+EXTRA_DIST = client.cpp server.cpp config.cpp
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = rstart rstartd config $(appman_DATA)
+CLEANFILES = rstart rstartd config
 
 #
 # commands and contexts
diff --git a/configure.ac b/configure.ac
index 0520a7e..94b378f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,7 @@ AC_ARG_WITH(default-man-path,  [  --with-default-man-path=PATH ],
         [ DEFAULT_X_MANPATH="${prefix}/man:/usr/share/man:/usr/man" ])
 AC_SUBST(DEFAULT_X_MANPATH)
 
-
-
-
-AC_OUTPUT([
-	Makefile 
-])
+AC_CONFIG_FILES([
+	Makefile
+	man/Makefile])
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..08a563c
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = rstartd.man  rstart.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/rstart.man b/man/rstart.man
index ab159f6..4384a51 100644
--- a/rstart.man
+++ b/man/rstart.man
@@ -112,6 +112,6 @@ rstart somehost exec xterm
 This is obviously dependent on the command interpreter being used on
 the remote system; the example given will work for the Bourne and C shells.
 .SH "SEE ALSO"
-rstartd(1), rsh(1), A Flexible Remote Execution Protocol Based on \fBrsh\fP
+rstartd(__appmansuffix__), rsh(__appmansuffix__), A Flexible Remote Execution Protocol Based on \fBrsh\fP
 .SH AUTHOR
 Jordan Brown, Quarterdeck Office Systems
diff --git a/rstartd.man b/man/rstartd.man
index 0b974d5..c1e53ac 100644
--- a/rstartd.man
+++ b/man/rstartd.man
@@ -269,6 +269,6 @@ with a bad library that doesn't know how to look host names up using DNS.
 The fix is to look up a host name in $DISPLAY and substitute an IP address.)
 This is a trivial example of an incompatibility that \fIrstart\fP can hide.
 .SH "SEE ALSO"
-rstart(1), rsh(1), A Flexible Remote Execution Protocol Based on \fBrsh\fP
+rstart(__appmansuffix__), rsh(__appmansuffix__), A Flexible Remote Execution Protocol Based on \fBrsh\fP
 .SH AUTHOR
 Jordan Brown, Quarterdeck Office Systems