From 82513d04a8381da8d2281d7581f6b0d65901aede Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 13 Nov 2005 02:08:07 +0000 Subject: Use sed to substitute variables in man pages --- ChangeLog | 7 +++++++ configure.ac | 1 + cxpm/Makefile.am | 36 ++++++++++++++++++++++++++++++++++-- sxpm/Makefile.am | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd99010..9cdba90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-12 Alan Coopersmith + + * configure.ac: + * cxpm/Makefile.am: + * sxpm/Makefile.am: + Use sed to substitute variables in man pages + 2005-11-09 Kevin E. Martin * configure.ac: diff --git a/configure.ac b/configure.ac index d18f206..9bf426f 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ PKG_CHECK_MODULES(SXPM, xt xext, build_sxpm=true, build_sxpm=false) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) +XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION AC_OUTPUT([Makefile diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am index 0abf869..7b8c790 100644 --- a/cxpm/Makefile.am +++ b/cxpm/Makefile.am @@ -2,6 +2,38 @@ bin_PROGRAMS = cxpm cxpm_CFLAGS = $(XPM_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/include/X11 -dist_man_MANS = cxpm.1 - cxpm_SOURCES = cxpm.c + +# Man page +appmandir = $(mandir)/man$(APP_MAN_SUFFIX) + +appman_SOURCES = cxpm.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|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|$(prefix)|g' \ + -e 's|__apploaddir__|$(appdefaultdir)|' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|$(ADMIN_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/sxpm/Makefile.am b/sxpm/Makefile.am index 0e4e570..4ea591e 100644 --- a/sxpm/Makefile.am +++ b/sxpm/Makefile.am @@ -6,15 +6,46 @@ sxpm_CFLAGS = $(SXPM_CFLAGS) INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -dist_man_MANS = sxpm.1 - sxpm_SOURCES = sxpm.c sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la +# Man page +appmandir = $(mandir)/man$(APP_MAN_SUFFIX) + +appman_SOURCES = sxpm.man +appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) + +CLEANFILES = $(appman_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|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|$(prefix)|g' \ + -e 's|__apploaddir__|$(appdefaultdir)|' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|$(ADMIN_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) < $< > $@ + endif EXTRA_DIST = \ plaid_ext.xpm \ plaid_mask.xpm \ - plaid.xpm + plaid.xpm \ + sxpm.man -- cgit v1.2.1