diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-09 20:27:46 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-01-18 15:09:55 -0800 |
| commit | a9e85013b1045c7e02891a019bfa8042a219b7f1 (patch) | |
| tree | 500f88597b05067ba9e3eb1d87e6887fa6ac5a02 /hw/xfree86 | |
| parent | dcdd8ea82c0e2f657abdc80a22aa0c01ead07e54 (diff) | |
man: build Xorg and xorg.conf man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/doc/man/.gitignore | 4 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/Makefile.am | 43 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/Xorg.man (renamed from hw/xfree86/doc/man/Xorg.man.pre) | 0 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man (renamed from hw/xfree86/doc/man/xorg.conf.man.pre) | 0 |
4 files changed, 22 insertions, 25 deletions
diff --git a/hw/xfree86/doc/man/.gitignore b/hw/xfree86/doc/man/.gitignore deleted file mode 100644 index 7a16e4a29..000000000 --- a/hw/xfree86/doc/man/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Add & Override for this directory and it's subdirectories -Xorg -Xorg.man -xorg.conf.man diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am index 737166b51..4fbc878c8 100644 --- a/hw/xfree86/doc/man/Makefile.am +++ b/hw/xfree86/doc/man/Makefile.am @@ -1,24 +1,25 @@ -# Xserver.man covers options generic to all X servers built in this tree -MAN_SRCS = Xorg.man.pre xorg.conf.man.pre - appmandir = $(APP_MAN_DIR) -appman_DATA = Xorg.$(APP_MAN_SUFFIX) +appman_PRE = Xorg.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) filemandir = $(FILE_MAN_DIR) -fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX) - -Xorg.$(APP_MAN_SUFFIX): Xorg.man - -$(AM_V_at)rm -f Xorg.$(APP_MAN_SUFFIX) - $(AM_V_at)$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX) - -xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man - -$(AM_V_at)rm -f xorg.conf.$(FILE_MAN_SUFFIX) - $(AM_V_at)$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX) - -include $(top_srcdir)/cpprules.in - -EXTRAMANDEFS = -D__logdir__=$(logdir) - -CLEANFILES = $(appman_DATA) $(fileman_DATA) xorg.conf.man Xorg.man - -EXTRA_DIST = $(MAN_SRCS) +fileman_PRE = xorg.conf.man +fileman_DATA = $(fileman_PRE:man=$(FILE_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) $(fileman_PRE) +CLEANFILES = $(appman_DATA) $(fileman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \ + -e 's|__datadir__|$(datadir)|g' \ + -e 's|__mandir__|$(mandir)|g' \ + -e 's|__sysconfdir__|$(sysconfdir)|g' \ + -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \ + -e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \ + -e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +.man.$(FILE_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man index 6fa334cc3..6fa334cc3 100644 --- a/hw/xfree86/doc/man/Xorg.man.pre +++ b/hw/xfree86/doc/man/Xorg.man diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man index e3fd0eadf..e3fd0eadf 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man |