[lib/Xrandr]

Use sed to fill in variables in man page Add shadow man pages for man pages
    that document multiple functions.

4 files changed, 88 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a1f6ea0..6b21e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-12  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac:
+	* man/Makefile.am: 
+	Use sed to fill in variables in man page
+	Add shadow man pages for man pages that document multiple functions.
+	
 2005-07-08  Keith Packard  <keithp@keithp.com>
 
 	* .cvsignore:
diff --git a/configure.ac b/configure.ac
index 9986430..2894611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ PKG_CHECK_MODULES(X, x11)
 RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xrender renderproto)
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile
diff --git a/man/.cvsignore b/man/.cvsignore
index 282522d..2d0f344 100644
--- a/man/.cvsignore
+++ b/man/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+*.3*
diff --git a/man/Makefile.am b/man/Makefile.am
index 90511c0..a5a0a17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,3 +1,80 @@
-man3_MANS = Xrandr.3
+# $Id$
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# 
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+# 
+# The above copyright notice and this permission notice 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 OPEN GROUP 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.
+# 
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+# 
 
-EXTRA_DIST = $(man3_MANS)
+libmandir = $(mandir)/man$(LIB_MAN_SUFFIX)
+
+libman_SOURCES = Xrandr.man
+
+libman_DATA = $(libman_SOURCES:man=$(LIB_MAN_SUFFIX)) \
+	      $(Xrandr_shadows:=.$(LIB_MAN_SUFFIX))
+
+BUILT_SOURCES = .shadows.DONE
+
+EXTRA_DIST = $(libman_SOURCES)
+
+CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
+	-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' 
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+.man.$(LIB_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+
+# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
+
+Xrandr_shadows =                            \
+    XRRQueryExtension                       \
+    XRRQueryVersion                         \
+    XRRGetScreenInfo                        \
+    XRRFreeScreenConfigInfo                 \
+    XRRSetScreenConfig                      \
+    XRRSetScreenConfigAndRate               \
+    XRRConfigRotations                      \
+    XRRConfigTimes                          \
+    XRRConfigSizes                          \
+    XRRConfigRates                          \
+    XRRConfigCurrentConfiguration           \
+    XRRConfigCurrentRate                    \
+    XRRRootToScreen                         \
+    XRRScreenConfig                         \
+    XRRConfig                               \
+    XRRSelectInput
+
+.shadows.DONE:
+	-rm -f $(Xrandr_shadows:=.$(LIB_MAN_SUFFIX))
+	(for i in $(Xrandr_shadows:=.$(LIB_MAN_SUFFIX)) ; do \
+	 echo .so man$(LIB_MAN_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX) > $$i; \
+	 done)