From b7cb4106bca08b2ffebf7494dcc547c974cd2bdb 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     | 18 +-----------------
 configure.ac    |  5 ++++-
 dga.man         | 16 ----------------
 man/Makefile.am | 12 ++++++++++++
 man/dga.man     | 16 ++++++++++++++++
 5 files changed, 33 insertions(+), 34 deletions(-)
 delete mode 100644 dga.man
 create mode 100644 man/Makefile.am
 create mode 100644 man/dga.man

diff --git a/Makefile.am b/Makefile.am
index 425d4e3..e7b4d2f 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 = dga
 
 AM_CFLAGS = $(CWARNFLAGS) $(XF86DGA_CFLAGS)
@@ -27,24 +28,7 @@ dga_LDADD = $(XF86DGA_LIBS)
 dga_SOURCES =	\
         dga.c
 
-appman_PRE = \
-        dga.man
-
-
-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 f7b99aa..ded116f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XF86DGA, [x11 xxf86dga >= 1.1])
 
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	man/Makefile])
+AC_OUTPUT
diff --git a/dga.man b/dga.man
deleted file mode 100644
index c7d9fc1..0000000
--- a/dga.man
+++ /dev/null
@@ -1,16 +0,0 @@
-.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.4 1997/11/08 16:24:37 hohndel Exp $
-.\"
-.TH dga 1 __vendorversion__
-.SH NAME
-dga \- test program for the XFree86-DGA extension
-.SH SYNOPSIS
-.B dga
-.SH DESCRIPTION
-Dga is a simple test client for the XFree86-DGA extension.  It fills
-the screen with a different colour for each key pressed.
-It prints some basic framebuffer parameters, and also
-keyboard and pointer events to stdout.  To exit, hit the `q' key.
-Hitting the `b' key runs a simple benchmark, measuring raw framebuffer
-write and read speed (this takes one second each).
-.SH AUTHOR
-Jon Tombs
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..7110bc5
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = dga.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/dga.man b/man/dga.man
new file mode 100644
index 0000000..c7d9fc1
--- /dev/null
+++ b/man/dga.man
@@ -0,0 +1,16 @@
+.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.4 1997/11/08 16:24:37 hohndel Exp $
+.\"
+.TH dga 1 __vendorversion__
+.SH NAME
+dga \- test program for the XFree86-DGA extension
+.SH SYNOPSIS
+.B dga
+.SH DESCRIPTION
+Dga is a simple test client for the XFree86-DGA extension.  It fills
+the screen with a different colour for each key pressed.
+It prints some basic framebuffer parameters, and also
+keyboard and pointer events to stdout.  To exit, hit the `q' key.
+Hitting the `b' key runs a simple benchmark, measuring raw framebuffer
+write and read speed (this takes one second each).
+.SH AUTHOR
+Jon Tombs
-- 
cgit v1.2.3