aboutsummaryrefslogtreecommitdiff
path: root/libX11/man/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-29 18:35:06 +0000
committermarha <marha@users.sourceforge.net>2009-10-29 18:35:06 +0000
commit5a5506fed918b6d1a041a040b2060ed25e40d464 (patch)
tree7a0ecf56aa04552bd8516610a07b572548aa4cb2 /libX11/man/Makefile.am
parente141b55eccf3c69d8ced513992e21463d37dbb03 (diff)
downloadvcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.tar.gz
vcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.tar.bz2
vcxsrv-5a5506fed918b6d1a041a040b2060ed25e40d464.zip
svn merge ^/branches/released
Diffstat (limited to 'libX11/man/Makefile.am')
-rw-r--r--libX11/man/Makefile.am17
1 files changed, 13 insertions, 4 deletions
diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index 045c7dc5b..c6aff51f5 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -194,30 +194,39 @@ libman_PRE = \
XmbTextExtents.man \
XmbTextPerCharExtents.man
+filemandir = $(FILE_MAN_DIR)
+fileman_PRE = Compose.man
+
# What we actually install
if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(all_shadows:=.@LIB_MAN_SUFFIX@)
+
+fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@)
endif
-EXTRA_DIST = $(libman_PRE)
+EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
-CLEANFILES = $(libman_DATA)
+CLEANFILES = $(libman_DATA) $(fileman_DATA)
include $(top_srcdir)/cpprules.in
-SUFFIXES += .$(LIB_MAN_SUFFIX) .man
+SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
+ -D__appmansuffix__=$(APP_MAN_SUFFIX) \
+ -D__filemansuffix__=$(FILE_MAN_SUFFIX) \
+ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
+ -D__xlocaledir__="$(X11_LOCALEDATADIR)" \
-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
-.man.$(LIB_MAN_SUFFIX):
+.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)