From db27eef6c2ab78bbae9fabcccd5720d3dfef44d9 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      | 14 +-------------
 configure.ac     |  5 ++++-
 man/Makefile.am  | 12 ++++++++++++
 man/xdriinfo.man | 38 ++++++++++++++++++++++++++++++++++++++
 xdriinfo.man     | 38 --------------------------------------
 5 files changed, 55 insertions(+), 52 deletions(-)
 create mode 100644 man/Makefile.am
 create mode 100644 man/xdriinfo.man
 delete mode 100644 xdriinfo.man

diff --git a/Makefile.am b/Makefile.am
index 425098a..7b70eb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xdriinfo
 
 AM_CFLAGS = $(CWARNFLAGS) $(XDRIINFO_CFLAGS)
@@ -27,16 +28,7 @@ xdriinfo_LDADD = $(XDRIINFO_LIBS)
 xdriinfo_SOURCES =	\
         xdriinfo.c
 
-appman_PRE = \
-	xdriinfo.man
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE) autogen.sh
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
 
 .PHONY: ChangeLog INSTALL
 
@@ -48,8 +40,4 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-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/configure.ac b/configure.ac
index 02ed833..48c2c00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,4 +45,7 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
 	AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
 	[$XDRIINFO_LIBS])
 
-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..07d2f1f
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xdriinfo.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/xdriinfo.man b/man/xdriinfo.man
new file mode 100644
index 0000000..75b9fc0
--- /dev/null
+++ b/man/xdriinfo.man
@@ -0,0 +1,38 @@
+.\" $XFree86$
+.TH xdriinfo 1 __vendorversion__
+.SH NAME
+xdriinfo \- query configuration information of DRI drivers
+.SH SYNOPSIS
+.B xdriinfo
+[\-display \fIdisplayname\fP] [command]
+.SH DESCRIPTION
+\fIxdriinfo\fP can be used to query configuration information of
+direct rendering drivers. If no command argument is specified it lists
+the names of the direct rendering drivers for all screens.
+.PP
+Valid commands are:
+.TP
+.B nscreens
+Print the number of screens.
+.TP
+.B driver \fIscreen\fP
+Print the name of the direct rendering driver for \fIscreen\fP.
+.TP
+.B options \fIscreen|driver\fP
+Print the XML document describing the configuration options of a
+driver. The driver can be specified directly by \fIdriver\fP name or
+indirectly by \fIscreen\fP number. If the driver name is specified
+directly then no X connection is needed.
+.SH ENVIRONMENT
+.TP
+.B DISPLAY
+The default display.
+.SH "SEE ALSO"
+.IR X (__miscmansuffix__),
+.IR xdpyinfo (__appmansuffix__),
+.IR xwininfo (__appmansuffix__),
+.IR xvinfo (__appmansuffix__),
+.IR glxinfo (__appmansuffix__),
+.IR xprop (__appmansuffix__)
+.SH AUTHOR
+Felix Kuehling
diff --git a/xdriinfo.man b/xdriinfo.man
deleted file mode 100644
index 75b9fc0..0000000
--- a/xdriinfo.man
+++ /dev/null
@@ -1,38 +0,0 @@
-.\" $XFree86$
-.TH xdriinfo 1 __vendorversion__
-.SH NAME
-xdriinfo \- query configuration information of DRI drivers
-.SH SYNOPSIS
-.B xdriinfo
-[\-display \fIdisplayname\fP] [command]
-.SH DESCRIPTION
-\fIxdriinfo\fP can be used to query configuration information of
-direct rendering drivers. If no command argument is specified it lists
-the names of the direct rendering drivers for all screens.
-.PP
-Valid commands are:
-.TP
-.B nscreens
-Print the number of screens.
-.TP
-.B driver \fIscreen\fP
-Print the name of the direct rendering driver for \fIscreen\fP.
-.TP
-.B options \fIscreen|driver\fP
-Print the XML document describing the configuration options of a
-driver. The driver can be specified directly by \fIdriver\fP name or
-indirectly by \fIscreen\fP number. If the driver name is specified
-directly then no X connection is needed.
-.SH ENVIRONMENT
-.TP
-.B DISPLAY
-The default display.
-.SH "SEE ALSO"
-.IR X (__miscmansuffix__),
-.IR xdpyinfo (__appmansuffix__),
-.IR xwininfo (__appmansuffix__),
-.IR xvinfo (__appmansuffix__),
-.IR glxinfo (__appmansuffix__),
-.IR xprop (__appmansuffix__)
-.SH AUTHOR
-Felix Kuehling
-- 
cgit v1.2.3