[PATCH libXext] man: using the C preprocessor is not required for man pages.

[Gaetan Nadon]

There were no special symbols needing cpp.
Everything can be handled by the default MAN_SUBSTS in util-macros.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |    3 ---
 man/Makefile.am |   39 ++-------------------------------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/configure.ac b/configure.ac
index ff8d916..be10934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,6 @@ AC_HEADER_STDC
 
 XORG_CHECK_MALLOC_ZERO
 
-# Man page processing requirements
-XORG_PROG_RAWCPP
-
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
 XORG_LINT_LIBRARY([Xext])
diff --git a/man/Makefile.am b/man/Makefile.am
index f3447bd..56b0b4a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -69,43 +69,8 @@ Xevi_shadowmen = $(Xevi_man_aliases:=. at LIB_MAN_SUFFIX@)
 $(Xevi_shadowmen):
 	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $@
 
-# Rules for generating files using the C pre-processor
-# (Replaces CppFileTarget from Imake)
-
-SED = sed
-
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
-# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
-# to cpp, because that trick does not work on all ANSI C preprocessors.
-# Delete line numbers from the cpp output (-P is not portable, I guess).
-# Allow XCOMM to be preceded by whitespace and provide a means of generating
-# output lines with trailing backslashes.
-# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
-
-CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
-                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
-                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
-                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
-                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
-                       -e '/\@\@$$/s/\@\@$$/\\/'
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-  XSERVERNAME = Xorg
-
-MANDEFS = \
-        -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-        -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
-	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
-	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
-	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
-	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
-	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-	-D__projectroot__=$(prefix)
-
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(LIB_MAN_SUFFIX):
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-- 
1.6.0.4