config: simplify building of shadow man pages

Store the shadow files in git as any other man page.
Move man pages to man dir and use the common makefile

Local fix in CVS for bug 5628
is not required as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba

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

12 files changed, 62 insertions, 35 deletions

diff --git a/Makefile.am b/Makefile.am
index 2a76275..9e8d95b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=man
+
 lib_LTLIBRARIES = libXau.la
 
 AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS)
@@ -48,39 +50,8 @@ $(LINTLIB): $(libXau_la_SOURCES)
 	$(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)
 endif MAKE_LINT_LIB
 
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libmandir = $(LIB_MAN_DIR)
-libman_PRE = Xau.man
-BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-
+CLEANFILES = $(lintlib_DATA)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = $(libman_PRE)
-
-Xau_shadows =                               \
-    XauFileName                             \
-    XauReadAuth                             \
-    XauLockAuth                             \
-    XauUnlockAuth                           \
-    XauWriteAuth                            \
-    XauDisposeAuth                          \
-    XauGetAuthByAddr                        \
-    XauGetBestAuthByAddr
-
-Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xau_shadows_man):
-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
-
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
-	$(AM_V_GEN)$(SED) \
-		-e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-	< $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 18771a6..f08800b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,10 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org 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.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 AC_PROG_CC
@@ -75,4 +75,5 @@ LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
 
 
 AC_OUTPUT([Makefile
+           man/Makefile
            xau.pc])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..4becb8a
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+libmandir = $(LIB_MAN_DIR)
+
+libman_PRE =				\
+	Xau.man				\
+	XauDisposeAuth.man		\
+	XauFileName.man			\
+	XauGetAuthByAddr.man		\
+	XauGetBestAuthByAddr.man	\
+	XauLockAuth.man			\
+	XauReadAuth.man			\
+	XauUnlockAuth.man		\
+	XauWriteAuth.man
+
+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
+
+EXTRA_DIST = $(libman_PRE)
+
+CLEANFILES = $(libman_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+.man.$(LIB_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/Xau.man b/man/Xau.man
index cc82bc7..cc82bc7 100644
--- a/Xau.man
+++ b/man/Xau.man
diff --git a/man/XauDisposeAuth.man b/man/XauDisposeAuth.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauDisposeAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauFileName.man b/man/XauFileName.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauFileName.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauGetAuthByAddr.man b/man/XauGetAuthByAddr.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauGetAuthByAddr.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauGetBestAuthByAddr.man b/man/XauGetBestAuthByAddr.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauGetBestAuthByAddr.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauLockAuth.man b/man/XauLockAuth.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauLockAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauReadAuth.man b/man/XauReadAuth.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauReadAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauUnlockAuth.man b/man/XauUnlockAuth.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauUnlockAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/man/XauWriteAuth.man b/man/XauWriteAuth.man
new file mode 100644
index 0000000..df111d6
--- /dev/null
+++ b/man/XauWriteAuth.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xau.__libmansuffix__