aboutsummaryrefslogtreecommitdiff
path: root/libX11/man
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-29 21:08:46 +0000
committermarha <marha@users.sourceforge.net>2010-08-29 21:08:46 +0000
commit432c39132c975e59fe4058ac615b07766c86007d (patch)
treebdced6cb337b28fd9c546f41a3554e41b8b37046 /libX11/man
parent29990b52b9d48ba282da3c773a92316a33cc0b19 (diff)
parent3f618a6c9607dfcffb2a4a870f8a5e0fc14106cb (diff)
downloadvcxsrv-432c39132c975e59fe4058ac615b07766c86007d.tar.gz
vcxsrv-432c39132c975e59fe4058ac615b07766c86007d.tar.bz2
vcxsrv-432c39132c975e59fe4058ac615b07766c86007d.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/man')
-rw-r--r--libX11/man/Makefile.am2
-rw-r--r--libX11/man/xkb/Makefile.am2
2 files changed, 0 insertions, 4 deletions
diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index ac3f25ea2..2b4bedadb 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -194,13 +194,11 @@ libman_PRE = \
filemandir = $(FILE_MAN_DIR)
fileman_PRE = Compose.man
-if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(all_shadows:=.@LIB_MAN_SUFFIX@)
fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \
$(file_shadows:=.@FILE_MAN_SUFFIX@)
-endif
EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
diff --git a/libX11/man/xkb/Makefile.am b/libX11/man/xkb/Makefile.am
index c5d970074..54f0fb4d8 100644
--- a/libX11/man/xkb/Makefile.am
+++ b/libX11/man/xkb/Makefile.am
@@ -202,9 +202,7 @@ libman_PRE = \
XkbUpdateMapFromCore.man \
XkbVirtualModsToReal.man
-if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
-endif
EXTRA_DIST = $(libman_PRE)