summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-11-03 16:57:01 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-11-03 16:57:01 +0000
commitf23defeef285b4a5bb58405589294bd557c9bb01 (patch)
tree74fdf6d009cee5e009bd320e0b382271a489277c
parentf5daec674aeb4fe6ccbc95ead8a319bbeb368d9f (diff)
Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1
-rw-r--r--ChangeLog5
-rw-r--r--doc/Makefile.am17
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b16c60af..96a60ad39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-03 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * doc/Makefile.am:
+ Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1
+
2005-11-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94cc964a8..88a1b9dca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,25 @@
+appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
+
# Xserver.man covers options generic to all X servers built in this tree
-MAN_SRCS = Xserver.man.pre
+appman_SOURCES = Xserver.man.pre
+
+appman_PROCESSED = $(appman_SOURCES:man.pre=man)
-man1_MANS = Xserver.man
+appman_DATA = $(appman_SOURCES:man.pre=@APP_MAN_SUFFIX@)
-all-local: $(man1_MANS)
+BUILT_SOURCES = $(appman_PROCESSED)
-CLEANFILES = $(man1_MANS)
+CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
include $(top_srcdir)/cpprules.in
+.man.$(APP_MAN_SUFFIX):
+ cp $< $@
+
EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`"
# Docs about X server internals that we ship with source but don't install
DEVEL_DOCS = smartsched
-EXTRA_DIST = $(DEVEL_DOCS) $(MAN_SRCS) \ No newline at end of file
+EXTRA_DIST = $(DEVEL_DOCS) $(appman_SOURCES)