From 77b57c63393ad16588b1da1503640c3af9657e07 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Fri, 20 Jan 2012 12:16:14 -0500
Subject: man: use X.Org makefile which will also fix failing distcheck

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 Makefile.am      |  3 ++-
 configure.ac     | 11 +++++++----
 man/Makefile.am  | 12 ++++++++++++
 man/transset.man | 18 ++++++++++++++++++
 transset.1       | 18 ------------------
 5 files changed, 39 insertions(+), 23 deletions(-)
 create mode 100644 man/Makefile.am
 create mode 100644 man/transset.man
 delete mode 100644 transset.1

diff --git a/Makefile.am b/Makefile.am
index 5d1d806..fd6627f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
+SUBDIRS = man
+
 bin_PROGRAMS = transset
-man_MANS = transset.1
 
 AM_CFLAGS = $(CWARNFLAGS) $(TRANSSET_CFLAGS)
 transset_LDADD = $(TRANSSET_LIBS) $(LIBOBJS)
diff --git a/configure.ac b/configure.ac
index d0351cb..b04ba86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,13 +9,16 @@ AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Checks for library functions.
 PKG_CHECK_MODULES(TRANSSET, x11)
 
-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..35f8f11
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = transset.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/transset.man b/man/transset.man
new file mode 100644
index 0000000..3fd8b13
--- /dev/null
+++ b/man/transset.man
@@ -0,0 +1,18 @@
+.ds q \N'34'
+.TH transset 1
+.SH NAME
+transset \- Set transparency on a window
+.SH SYNOPSIS
+.BI "transset [\-d " display "] n
+.SH DESCRIPTION
+.B transset
+is a simple program for X servers supporting the XFIXES, DAMAGE,
+and COMPOSITE extensions.  It lets the user set the transparency on a window.
+.SH OPTIONS
+.TP
+.BI n
+Where n is a number from 0 to 1, zero being transparent and 1 being opaque
+.SH BUGS
+Probably.  Please report any you find to http://bugs.freedesktop.org/.
+.SH AUTHORS
+Matthew Hawn
diff --git a/transset.1 b/transset.1
deleted file mode 100644
index 3fd8b13..0000000
--- a/transset.1
+++ /dev/null
@@ -1,18 +0,0 @@
-.ds q \N'34'
-.TH transset 1
-.SH NAME
-transset \- Set transparency on a window
-.SH SYNOPSIS
-.BI "transset [\-d " display "] n
-.SH DESCRIPTION
-.B transset
-is a simple program for X servers supporting the XFIXES, DAMAGE,
-and COMPOSITE extensions.  It lets the user set the transparency on a window.
-.SH OPTIONS
-.TP
-.BI n
-Where n is a number from 0 to 1, zero being transparent and 1 being opaque
-.SH BUGS
-Probably.  Please report any you find to http://bugs.freedesktop.org/.
-.SH AUTHORS
-Matthew Hawn
-- 
cgit v1.2.3