From e0f87cad8fb25c0ad04032a3d8b57e1a16c2f8ad Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Wed, 19 Jan 2011 10:06:56 -0500
Subject: 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>
---
 Makefile.am     | 17 +----------------
 configure.ac    |  5 ++++-
 man/Makefile.am | 12 ++++++++++++
 man/xmore.man   | 16 ++++++++++++++++
 xmore.man       | 16 ----------------
 5 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 man/Makefile.am
 create mode 100644 man/xmore.man
 delete mode 100644 xmore.man

diff --git a/Makefile.am b/Makefile.am
index c2a8841..8f03733 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xmore
 
 AM_CFLAGS = $(XMORE_CFLAGS) -DXMORE $(CWARNFLAGS)
@@ -28,9 +29,6 @@ xmore_SOURCES =	\
         xmore.c \
         xmore.h
 
-appman_PRE = \
-        xmore.man
-
 # App default files
 DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
@@ -41,20 +39,7 @@ dist_appdefault_DATA = \
 
 EXTRA_DIST = xmore.xml
 
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST += $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-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) < $< > $@
-
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 6c8d11f..0f86cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,4 +50,7 @@ AC_ARG_WITH(appdefaultdir,
 AC_SUBST(appdefaultdir)
 
 
-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..e90de34
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xmore.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/man/xmore.man b/man/xmore.man
new file mode 100644
index 0000000..4d6db60
--- /dev/null
+++ b/man/xmore.man
@@ -0,0 +1,16 @@
+.\" -*- coding: us-ascii -*-
+.TH xmore __appmansuffix__ "1 February 2005"
+.SH NAME
+xmore \- plain text display program for the X Window System
+.SH SYNOPSIS
+.ad l
+\fBxmore\fR \kx
+.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
+'in \n(.iu+\nxu
+[\fB\fBfilename\fR\fR]
+'in \n(.iu-\nxu
+.ad b
+.SH DESCRIPTION
+xmore is a plain text browser.
+.SH "SEE ALSO"
+\fBX11\fR(__miscmansuffix__), \fBxman\fR(__appmansuffix__)
diff --git a/xmore.man b/xmore.man
deleted file mode 100644
index 4d6db60..0000000
--- a/xmore.man
+++ /dev/null
@@ -1,16 +0,0 @@
-.\" -*- coding: us-ascii -*-
-.TH xmore __appmansuffix__ "1 February 2005"
-.SH NAME
-xmore \- plain text display program for the X Window System
-.SH SYNOPSIS
-.ad l
-\fBxmore\fR \kx
-.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
-'in \n(.iu+\nxu
-[\fB\fBfilename\fR\fR]
-'in \n(.iu-\nxu
-.ad b
-.SH DESCRIPTION
-xmore is a plain text browser.
-.SH "SEE ALSO"
-\fBX11\fR(__miscmansuffix__), \fBxman\fR(__appmansuffix__)
-- 
cgit v1.2.3