aboutsummaryrefslogtreecommitdiff
path: root/libX11/specs
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-13 06:36:43 +0000
committermarha <marha@users.sourceforge.net>2011-04-13 06:36:43 +0000
commit125aba11ec484309e4dc5b2abf1b15ac98784159 (patch)
treee74bec46d529ddc000a06bc9b01554bc1ff9c54b /libX11/specs
parent7730393619080086530e24d3b594351b4114f608 (diff)
downloadvcxsrv-125aba11ec484309e4dc5b2abf1b15ac98784159.tar.gz
vcxsrv-125aba11ec484309e4dc5b2abf1b15ac98784159.tar.bz2
vcxsrv-125aba11ec484309e4dc5b2abf1b15ac98784159.zip
xkeyboard-config libxcb libX11 git update 13 April 2011
Diffstat (limited to 'libX11/specs')
-rw-r--r--libX11/specs/XIM/Makefile.am2
-rw-r--r--libX11/specs/i18n/framework/Makefile.am4
-rw-r--r--libX11/specs/i18n/localedb/Makefile.am4
-rw-r--r--libX11/specs/i18n/trans/Makefile.am4
-rw-r--r--libX11/specs/libX11/Makefile.am4
5 files changed, 4 insertions, 14 deletions
diff --git a/libX11/specs/XIM/Makefile.am b/libX11/specs/XIM/Makefile.am
index a1fa72da5..68b0b3f48 100644
--- a/libX11/specs/XIM/Makefile.am
+++ b/libX11/specs/XIM/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = xim.xml
@@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/libX11/specs/i18n/framework/Makefile.am b/libX11/specs/i18n/framework/Makefile.am
index 6e8b0106a..af7ae1d0e 100644
--- a/libX11/specs/i18n/framework/Makefile.am
+++ b/libX11/specs/i18n/framework/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = framework.xml
@@ -9,10 +8,9 @@ docbook = framework.xml
chapters = framework.svg
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/framework
+shelfdir = $(docdir)/i18n/framework
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/libX11/specs/i18n/localedb/Makefile.am b/libX11/specs/i18n/localedb/Makefile.am
index 8db6a7bda..68a917c95 100644
--- a/libX11/specs/i18n/localedb/Makefile.am
+++ b/libX11/specs/i18n/localedb/Makefile.am
@@ -1,15 +1,13 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = localedb.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/localedb
+shelfdir = $(docdir)/i18n/localedb
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/libX11/specs/i18n/trans/Makefile.am b/libX11/specs/i18n/trans/Makefile.am
index cdec7509b..40a135a2f 100644
--- a/libX11/specs/i18n/trans/Makefile.am
+++ b/libX11/specs/i18n/trans/Makefile.am
@@ -1,15 +1,13 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = trans.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/trans
+shelfdir = $(docdir)/i18n/trans
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/libX11/specs/libX11/Makefile.am b/libX11/specs/libX11/Makefile.am
index 0e59ad887..b87e568cd 100644
--- a/libX11/specs/libX11/Makefile.am
+++ b/libX11/specs/libX11/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = libX11.xml
@@ -31,10 +30,9 @@ chapters = \
glossary.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)
+shelfdir = $(docdir)/libX11
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS