summaryrefslogtreecommitdiff
path: root/xserver/doc/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-27 19:02:39 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-27 19:02:39 +0000
commit269d40cbcc43b41f621ca6d91c182952f60ec48e (patch)
tree872f2fddd3f2207e57a28595e73886713ce4a77a /xserver/doc/Makefile.am
parent917a2249b787451cad3f9697872aeccfd0da3324 (diff)
Update to xserver 1.8. Tested by many. Ok oga@, todd@.
Diffstat (limited to 'xserver/doc/Makefile.am')
-rw-r--r--xserver/doc/Makefile.am21
1 files changed, 5 insertions, 16 deletions
diff --git a/xserver/doc/Makefile.am b/xserver/doc/Makefile.am
index d3911c9bf..2ff683c7f 100644
--- a/xserver/doc/Makefile.am
+++ b/xserver/doc/Makefile.am
@@ -1,35 +1,24 @@
-appmandir = $(APP_MAN_DIR)
-filemandir = $(FILE_MAN_DIR)
# Xserver.man covers options generic to all X servers built in this tree
# (i.e. those handled in the os/utils.c options processing instead of in
# the DDX-level options processing)
+appmandir = $(APP_MAN_DIR)
appman_PRE = Xserver.man.pre
-fileman_PRE =
appman_PROCESSED = $(appman_PRE:man.pre=man)
-fileman_PROCESSED = $(fileman_PRE:man.pre=man)
-
appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
-fileman_DATA = $(fileman_PRE:man.pre=@FILE_MAN_SUFFIX@)
-BUILT_SOURCES = $(appman_PROCESSED) $(fileman_PROCESSED)
-
-CLEANFILES = $(appman_PROCESSED) $(appman_DATA) \
- $(fileman_PROCESSED) $(fileman_DATA)
+BUILT_SOURCES = $(appman_PROCESSED)
+CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
include $(top_srcdir)/cpprules.in
.man.$(APP_MAN_SUFFIX):
- cp $< $@
-
-.man.$(FILE_MAN_SUFFIX):
- cp $< $@
+ $(AM_V_at)cp $< $@
-EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`"
+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) $(appman_PRE) $(fileman_PRE)