svn merge ^/branches/released .

1 files changed, 9 insertions, 26 deletions

diff --git a/libX11/specs/i18n/localedb/Makefile.am b/libX11/specs/i18n/localedb/Makefile.am
index 99b5086da..71014222d 100644
--- a/libX11/specs/i18n/localedb/Makefile.am
+++ b/libX11/specs/i18n/localedb/Makefile.am
@@ -1,32 +1,15 @@
-#

-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

-#

-# Permission is hereby granted, free of charge, to any person obtaining a

-# copy of this software and associated documentation files (the "Software"),

-# to deal in the Software without restriction, including without limitation

-# the rights to use, copy, modify, merge, publish, distribute, sublicense,

-# and/or sell copies of the Software, and to permit persons to whom the

-# Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-# DEALINGS IN THE SOFTWARE.

-#

 

 if ENABLE_SPECS

+if HAVE_XMLTO

 

-specdir = $(docdir)/$(subdir)

-doc_sources = localedb.xml

-dist_spec_DATA = $(doc_sources)

+# Main DocBook/XML files (DOCTYPE book)

+docbook = localedb.xml

 

-include $(top_srcdir)/specs/xmlrules.in

+# The location where the DocBook/XML files and their generated formats are installed

+shelfdir = $(docdir)/localedb

 

+# Generate DocBook/XML output formats with or without stylesheets

+include $(top_srcdir)/docbook.am

+

+endif HAVE_XMLTO

 endif ENABLE_SPECS