[PATCH xserver] doc: finish the removal of SecurityPolicy file man pages
Gaetan Nadon
memsize at videotron.ca
Tue Jan 26 17:19:57 PST 2010
The variable was unassigned but all the code was left in.
Reviewed-by: Alan Coopersmith <alan.coopersmith at sun.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
doc/Makefile.am | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d3911c9..bee64b6 100644
--- a/doc/Makefile.am
+++ b/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 $< $@
-
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)
--
1.6.0.4
Transfering to release management for git master
Ignore the first post without the approval tag, sorry.
More information about the xorg-devel
mailing list