From 4aa61aed87e43e660386ce5f41754ec2f675f1dc Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat, 12 Nov 2005 20:22:03 +0000
Subject: Substitute variables in man page

---
 ChangeLog    |  6 ++++++
 Makefile.am  | 37 ++++++++++++++++++++++++++++++++++---
 configure.ac |  4 ++--
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3dbb36d..493af35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-12  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac: 
+	* Makefile.am:
+	Substitute variables in man page
+
 2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 1ec0ef6..eb2a7a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,6 @@ XCONFDIR = $(libdir)/X11/config
 
 bin_SCRIPTS = xmkmf
 
-dist_man1_MANS = \
-        xmkmf.man
-
 xmkmf: xmkmf.cpp
 	$(RAWCPP) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
 #	$(RAWCPP) -DCONFIGDIRSPEC=$(XCONFDIR) $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
@@ -33,3 +30,37 @@ xmkmf: xmkmf.cpp
 CLEANFILES = xmkmf
 
 EXTRA_DIST = xmkmf.cpp
+
+# Man page
+appmandir =  $(mandir)/man$(APP_MAN_SUFFIX)
+
+appman_SOURCES = xmkmf.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' \
+	-e 's|__cpp__|$(RAWCPP)|g'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/configure.ac b/configure.ac
index 9a61ee9..27b54fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,10 @@ AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CPP
-AC_PATH_PROGS(RAWCPP, [cpp], [$(CPP)], 
-   [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+XORG_PROG_RAWCPP
 AC_PATH_PROG(SED, sed)
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3