diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | man/Makefile.am | 55 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 64 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2005-10-16 Alan Coopersmith <alan.coopersmith@sun.com> + + * src/Makefile.am: + Capitalize O in "X.Org Foundation" + + * configure.ac: + * man/Makefile.am: + Use cpp to substitute variables in man pages + 2005-10-15 Kevin E. Martin <kem-at-freedesktop-dot-org> * src/Makefile.am: Have generated files be cleaned by maintainer diff --git a/configure.ac b/configure.ac index bd60500..a4cb3fd 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ PKG_CHECK_MODULES(TWM, x11 xt xmu) AC_SUBST(TWM_CFLAGS) AC_SUBST(TWM_LIBS) +XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_OUTPUT([Makefile diff --git a/man/Makefile.am b/man/Makefile.am index e442c62..f17388c 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,3 +1,54 @@ -dist_man1_MANS = \ - twm.man +# $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. +# +appmandir = $(mandir)/man$(APP_MAN_SUFFIX) + +appman_SOURCES = twm.man + +appman_DATA = $(appman_SOURCES:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_SOURCES) + +CLEANFILES = $(appman_DATA) + +SED = sed + +# Strings to replace in man pages +XORGRELSTRING = @PACKAGE_STRING@ + XORGMANNAME = X Version 11 + +MAN_SUBSTS = \ + -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__projectroot__|$(prefix)|g' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +.man.$(APP_MAN_SUFFIX): + sed $(MAN_SUBSTS) < $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index ea65852..c882caa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ AM_YFLAGS = -d bin_PROGRAMS = twm -twm_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE +twm_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE twm_LDADD = $(TWM_LIBS) twm_SOURCES = \ |