[PATCH xserver 03/15] Xquartz: build Xquartz man pages using XORG_MANPAGE_SECTIONS
Gaetan Nadon
memsize at videotron.ca
Sat Jan 8 18:19:29 PST 2011
Nothing requires the use of a C preprocessor
Using standard file exentions (.man)
Use standard directory and makefile
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
hw/xquartz/doc/Makefile.am | 19 ++++++++-----------
hw/xquartz/doc/{Xquartz.man.pre => Xquartz.man} | 0
2 files changed, 8 insertions(+), 11 deletions(-)
rename hw/xquartz/doc/{Xquartz.man.pre => Xquartz.man} (100%)
diff --git a/hw/xquartz/doc/Makefile.am b/hw/xquartz/doc/Makefile.am
index 6c68c84..287dc7a 100644
--- a/hw/xquartz/doc/Makefile.am
+++ b/hw/xquartz/doc/Makefile.am
@@ -1,16 +1,13 @@
appmandir = $(APP_MAN_DIR)
-appman_PRE = Xquartz.man.pre
-appman_PROCESSED = $(appman_PRE:man.pre=man)
-appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
+appman_PRE = Xquartz.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
-CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
-include $(top_srcdir)/cpprules.in
-
-MANDEFS += -D__laucnd_id_prefix__=$(LAUNCHD_ID_PREFIX)
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__laucnd_id_prefix__|$(LAUNCHD_ID_PREFIX)|g'
.man.$(APP_MAN_SUFFIX):
- $(AM_V_at)cp $< $@
-
-EXTRA_DIST = \
- Xquartz.man.pre
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/xquartz/doc/Xquartz.man.pre b/hw/xquartz/doc/Xquartz.man
similarity index 100%
rename from hw/xquartz/doc/Xquartz.man.pre
rename to hw/xquartz/doc/Xquartz.man
--
1.6.0.4
More information about the xorg-devel
mailing list