diff options
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/docbook.am | 2 | ||||
| -rw-r--r-- | libX11/modules/im/ximcp/imRmAttr.c | 4 | ||||
| -rw-r--r-- | libX11/specs/XIM/Makefile.am | 2 | ||||
| -rw-r--r-- | libX11/specs/i18n/framework/Makefile.am | 4 | ||||
| -rw-r--r-- | libX11/specs/i18n/localedb/Makefile.am | 4 | ||||
| -rw-r--r-- | libX11/specs/i18n/trans/Makefile.am | 4 | ||||
| -rw-r--r-- | libX11/specs/libX11/Makefile.am | 4 |
7 files changed, 8 insertions, 16 deletions
diff --git a/libX11/docbook.am b/libX11/docbook.am index 3cf21e879..693708351 100644 --- a/libX11/docbook.am +++ b/libX11/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) diff --git a/libX11/modules/im/ximcp/imRmAttr.c b/libX11/modules/im/ximcp/imRmAttr.c index 5035df514..7503905b2 100644 --- a/libX11/modules/im/ximcp/imRmAttr.c +++ b/libX11/modules/im/ximcp/imRmAttr.c @@ -1384,7 +1384,7 @@ _XimCountNumberOfAttr( { unsigned int n; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attribute */ @@ -1417,7 +1417,7 @@ _XimGetAttributeID( int values_len; register int i; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attr */ /* 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 |