diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2011-06-23 15:16:47 -0400 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2011-08-05 12:36:03 -0400 |
commit | 5cc8815b8a117cf0b6af37e7d55c5a420d9fff57 (patch) | |
tree | f947eae3333b23c5025f7c74cf50a9c4278e23f8 /configure.ac | |
parent | adebbe3856b4aee39c0c7af902c1dea847dd6d7c (diff) |
specs: build compose keys tables in specs/i18n/compose
Build the tables article together with the rest of the specs.
Make it transparent that the source in generated in nls.
Reuse docbook.am and get all the features such as olink.
The docbook article file stem and id must be the same. The new name
for the main article is libX11-keys. The new installation location
is $docdir/libX11/i18n/compose.
The nls dir retains the role of generating the DocBook/XML source
but does not build neither installs output formats or generated source.
The tables article now has to specify that each included locale
section is a dependency. It did not matter before as they were web links.
The xorg-sgml-doctools masterdb shall be updated to include this new doc.
Install location moved from doc/libX11/Compose to doc/libX11/i18n/compose.
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6a4878e8..7c5a14c5 100644 --- a/configure.ac +++ b/configure.ac @@ -421,6 +421,20 @@ X11_LOCALEDIR="${X11_LOCALEDATADIR}" AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data]) AC_SUBST(X11_LOCALEDIR) +locales="\ + am_ET.UTF-8 armscii-8 C el_GR.UTF-8 en_US.UTF-8 fi_FI.UTF-8 \ + georgian-academy georgian-ps ibm-cp1133 iscii-dev isiri-3342 \ + iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ + iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \ + iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\ + ja.S90 ja.SJIS ja.U90 ko koi8-c koi8-r \ + koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \ + microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \ + tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \ + zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 zh_HK.big5 \ + zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 zh_TW.UTF-8" +AC_SUBST(locales) + XKEYSYMDB="${X11_DATADIR}/XKeysymDB" AX_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database]) @@ -451,6 +465,7 @@ AC_CONFIG_FILES([Makefile nls/Makefile specs/Makefile specs/i18n/Makefile + specs/i18n/compose/Makefile specs/i18n/framework/Makefile specs/i18n/localedb/Makefile specs/i18n/trans/Makefile |