From c06c46acdc2ead20a6030118fad6092b3da6709f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 9 Jan 2011 20:27:47 -0500 Subject: [PATCH] Xquartz: build Xquartz man pages using XORG_MANPAGE_SECTIONS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nothing requires the use of a C preprocessor Using standard file extensions (.man) Use standard directory and makefile Reviewed-by: Alan Coopersmith Reviewed-by: Rémi Cardona Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- hw/xquartz/doc/Makefile.am | 19 ++++++++----------- .../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 6c68c845e..287dc7aab 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