Use sed to put version number in man page Add shadow man pages for man

    pages that document multiple functions.

5 files changed, 88 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8bad191..aec5cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-12  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac:
+	* Makefile.am:
+	* man/Makefile.am: 
+	Use sed to put version number in man page
+	Add shadow man pages for man pages that document multiple functions.
+
 2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 4e1fb40..f5babed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
-# $XdotOrg: $
+# $Id$
 
 AM_CFLAGS = $(XEVIE_CFLAGS) $(X_CFLAGS)
 
-SUBDIRS = src
+SUBDIRS = src man
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xevie.pc
 
-dist_man3_MANS = man/Xevie.man
-
 EXTRA_DIST = xevie.pc.in autogen.sh
diff --git a/configure.ac b/configure.ac
index 3923fbb..f258638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $XdotOrg: $
+dnl $Id$
 dnl
 dnl Process this file with autoconf to create configure.
 
@@ -19,9 +19,11 @@ PKG_CHECK_MODULES(XEVIE, xproto x11 xextproto xext evieproto)
 AC_SUBST(XEVIE_CFLAGS)
 AC_SUBST(XEVIE_LIBS)
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile
 	   src/Makefile
+	   man/Makefile
            xevie.pc])
 
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..5b1becf
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+*.3
+*.3x
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..b4deed9
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,71 @@
+# $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.
+# 
+
+libmandir = $(mandir)/man$(LIB_MAN_SUFFIX)
+
+libman_SOURCES = Xevie.man
+
+libman_DATA = $(libman_SOURCES:man=$(LIB_MAN_SUFFIX)) \
+	      $(Xevie_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/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
+	-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
+	-e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+.man.$(LIB_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+
+# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
+
+Xevie_shadows =                             \
+    XevieQueryVersion                       \
+    XevieStart                              \
+    XevieSelectInput                        \
+    XevieSendEvent                          \
+    XevieEnd
+
+.shadows.DONE:
+	-rm -f $(Xevie_shadows:=.$(LIB_MAN_SUFFIX))
+	(for i in $(Xevie_shadows:=.$(LIB_MAN_SUFFIX)) ; do \
+	 echo .so man$(LIB_MAN_SUFFIX)/Xevie.$(LIB_MAN_SUFFIX) > $$i; \
+	 done)