From 3a5f945b6e15c6799b2a796f82ed1222140fc62d Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat, 12 Nov 2005 20:04:58 +0000
Subject: Substitute variables in man page [Also resync Changelog with
 monolith]

---
 ChangeLog    | 36 +++++++++++++++++++++++++++++++++++-
 Makefile.am  | 35 ++++++++++++++++++++++++++++++++++-
 configure.ac |  1 +
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aada854..a629ff3 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-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
@@ -34,6 +40,34 @@
 
 ChangeLog history excerpts from Xorg monolithic tree for releases 6.7 -> 6.9:
 
+2005-10-03  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+        * config/imake/imakemdep.h:
+        Bug #3812 <https://bugs.freedesktop.org/show_bug.cgi?id=3812>
+        Patch #3462 <https://bugs.freedesktop.org/attachment.cgi?id=3462>
+        GNU/kFreeBSD Imake support (Robert Millan)       
+	
+2005-07-31  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+        * config/imake/imakemdep.h: 
+        Pass through __BUILTIN_VA_STRUCT and __BUILTIN_VA_ARG_INCR defines
+        in makedepend so it doesn't issue errors when source files include
+        <varargs.h> or <stdarg.h> on Solaris 10.
+	
+2005-07-29  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+        * config/makedepend/def.h:
+        Update #includes to use <X11/*.h> for modularization.
+
+2005-07-05  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+        * config/makedepend/main.c:
+        Bugzilla #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901>
+        Patch #2320 <https://bugs.freedesktop.org/attachment.cgi?id=2320>
+
+        Remove warning about whitespace in pre-processor defines.
+        (Peter Breitenlohner)
+
 2005-05-15  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* config/makedepend/main.c:
@@ -166,4 +200,4 @@ XFree86 3.1.1c (12 March 1995)
       xf86_OSlib.h to be cleaned up a little.
 
 [X.Org, Open Group & X Consortium change logs from X11R6.6 and earlier are
- not available.]
+ not available at this time.]
diff --git a/Makefile.am b/Makefile.am
index 355b2f9..b40e348 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 # $XdotOrg: $
 
 bin_PROGRAMS = makedepend
-man1_MANS = makedepend.man
 
 INCLUDES =  @X_CFLAGS@
 
@@ -18,3 +17,37 @@ makedepend_SOURCES = include.c \
 makedepend_CPPFLAGS = -DOBJSUFFIX=\".${OBJEXT}\" -DINCLUDEDIR=\"/usr/include\"
 
 EXTRA_DIST = autogen.sh makedepend.man
+
+# Man page
+appmandir =  $(mandir)/man$(APP_MAN_SUFFIX)
+
+appman_SOURCES = makedepend.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 5fe614b..2324988 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@ dnl Check for pkg-config packages
 PKG_CHECK_MODULES(X, [xproto])
 AC_SUBST(X_CFLAGS)
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.1