diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-13 18:14:22 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-11-13 18:14:22 +0000 |
| commit | 6424ff482a845160bc1146bb8a17fa2bde976685 (patch) | |
| tree | a5746dbab9ab1cfeaa37bf2d4abdb959c3ba2e25 | |
| parent | 68ee705e1066d5092bc266c9d47d6c1022be2f1c (diff) | |
Use $(LIB_MAN_SUFFIX) instead of forcing man pages into section 3. Use sed
to substitute variables in man pages.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 59 |
3 files changed, 49 insertions, 20 deletions
@@ -1,3 +1,10 @@ +2005-11-13 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + * man/Makefile.am: + Use $(LIB_MAN_SUFFIX) instead of forcing man pages into section 3. + Use sed to substitute variables in man pages. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index a552974..0568bfe 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,8 @@ PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto) AC_SUBST(DMX_CFLAGS) AC_SUBST(DMX_LIBS) - + +XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_OUTPUT([Makefile diff --git a/man/Makefile.am b/man/Makefile.am index d697660..cc773b3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,23 +19,44 @@ # PERFORMANCE OF THIS SOFTWARE. # -man_MANS = \ - DMX.3 \ - DMXAddInput.3 \ - DMXAddScreen.3 \ - DMXChangeDesktopAttributes.3 \ - DMXChangeScreensAttributes.3 \ - DMXForceWindowCreation.3 \ - DMXGetDesktopAttributes.3 \ - DMXGetInputAttributes.3 \ - DMXGetInputCount.3 \ - DMXGetScreenAttributes.3 \ - DMXGetScreenCount.3 \ - DMXGetWindowAttributes.3 \ - DMXQueryExtension.3 \ - DMXQueryVersion.3 \ - DMXRemoveInput.3 \ - DMXRemoveScreen.3 \ - DMXSync.3 -EXTRA_DIST = $(man_MANS) +libmandir = $(mandir)/man$(LIB_MAN_SUFFIX) +libman_SOURCES = \ + DMX.man \ + DMXAddInput.man \ + DMXAddScreen.man \ + DMXChangeDesktopAttributes.man \ + DMXChangeScreensAttributes.man \ + DMXForceWindowCreation.man \ + DMXGetDesktopAttributes.man \ + DMXGetInputAttributes.man \ + DMXGetInputCount.man \ + DMXGetScreenAttributes.man \ + DMXGetScreenCount.man \ + DMXGetWindowAttributes.man \ + DMXQueryExtension.man \ + DMXQueryVersion.man \ + DMXRemoveInput.man \ + DMXRemoveScreen.man \ + DMXSync.man + +libman_DATA = $(libman_SOURCES:man=@LIB_MAN_SUFFIX@) + +EXTRA_DIST = $(libman_SOURCES) + +CLEANFILES = $(libman_DATA) + +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) < $< > $@ |