utf8 conversion: fix up seperation of locale and doc building

Docs (help and the dtinfo guides) are now always built using the
ISO8859-1 locale.  To support UTF-8, our docbook needs to be updated
to something from this century, ideally this decade.  In addition, a
conversion to XML would also be required as a result.  So, until that
happens, use ISO8859-1 for docs.

However, other locale information, like message catalogs, resource
files, and the like are now converted to UTF-8.

All supported languages are now built by default on linux again.

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 7207c92050a510798e84f8aa69426f613263b2f9..7321f87d3049321df50ea8112cbce5022eee6880 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -127,8 +127,10 @@ XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
 XCOMM DtLocalesToBuild: de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 en_US.UTF-8
 # if !defined(DtLocalesToBuild)
-#  define DtLocalesToBuild en_US.UTF-8
+#  define DtLocalesToBuild en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8
 # endif
+XCOMM This is a hack for the en_US.UTF-8 stuff, which should be redone
+XCOMM as a proper locale, rather than aliasing C
 # define UTF8_NLS_SUPPORT
 #endif
 
@@ -155,9 +157,11 @@ XCOMM DtLocalesToBuild: de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 en_US.UT
 #endif
 #endif
 
-XCOMM define DtDocLocalesToBuild to be the same as DtLocalesToBuild if undefined
+XCOMM The documentation can only be built with ISO8859-1 encoding.
+XCOMM An upgrade to docbook and conversion to XML is required to properly
+XCOMM support utf8 with dtinfo and dthelp files.
 #ifndef DtDocLocalesToBuild
-# define DtDocLocalesToBuild DtLocalesToBuild
+# define DtDocLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
 #endif /* AfterVendorCF */

diff --git a/cde/doc/de_DE.ISO8859-1/guides/Imakefile b/cde/doc/de_DE.ISO8859-1/guides/Imakefile
index 3d3884d61394a980ea2ecaa9ef050a7152868da5..a253db9b64022acc25595c282a53b6802be3b684 100644 (file)
--- a/cde/doc/de_DE.ISO8859-1/guides/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 19:31:32 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/German.tmpl"
 #include "../../common/guides/Imakefile.tmpl"

diff --git a/cde/doc/de_DE.ISO8859-1/help/Imakefile b/cde/doc/de_DE.ISO8859-1/help/Imakefile
index 5ee0e19ba3004556c863eafd170c0dd1974694b5..2161fc14a83928e64a394da80a757f06b40e7e0e 100644 (file)
--- a/cde/doc/de_DE.ISO8859-1/help/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 17:16:01 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/German.tmpl"
 #include "../../common/help/Imakefile.tmpl"

diff --git a/cde/doc/es_ES.ISO8859-1/guides/Imakefile b/cde/doc/es_ES.ISO8859-1/guides/Imakefile
index 2b85e262b0dca392b64a72cb95cc9628d137debd..71ec99089b374f9dcfa5c6f3de22156f2970dd35 100644 (file)
--- a/cde/doc/es_ES.ISO8859-1/guides/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/20 11:35:35 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Spanish.tmpl"
 #include "../../common/guides/Imakefile.tmpl"

diff --git a/cde/doc/es_ES.ISO8859-1/help/Imakefile b/cde/doc/es_ES.ISO8859-1/help/Imakefile
index 9115fdcf76adf1d88b800aa99443226a5080703d..3c3f761cf162e5b570a845a0934b147b4f331a3a 100644 (file)
--- a/cde/doc/es_ES.ISO8859-1/help/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/20 11:34:27 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Spanish.tmpl"
 #include "../../common/help/Imakefile.tmpl"

diff --git a/cde/doc/fr_FR.ISO8859-1/guides/Imakefile b/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
index b009ea014b7b1a3ed3fc1212195cdea9400e5559..3ba6cfd516cd0b3e60fc6e1ba063cf4ea40c56cc 100644 (file)
--- a/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 15:13:06 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/French.tmpl"
 #include "../../common/guides/Imakefile.tmpl"

diff --git a/cde/doc/fr_FR.ISO8859-1/help/Imakefile b/cde/doc/fr_FR.ISO8859-1/help/Imakefile
index a245b48b21cfa247dc83ab41e379acf7e4f82122..4b4834aa39f42a3e727f20d1ea1e6b99c31e7563 100644 (file)
--- a/cde/doc/fr_FR.ISO8859-1/help/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 19:30:25 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/French.tmpl"
 #include "../../common/help/Imakefile.tmpl"

diff --git a/cde/doc/it_IT.ISO8859-1/guides/Imakefile b/cde/doc/it_IT.ISO8859-1/guides/Imakefile
index 8623008baa9f3f0f8985ab2b14421ab8b34d4119..6825709c54222d0d3a2e8a93d16ec4ce1c2f35f8 100644 (file)
--- a/cde/doc/it_IT.ISO8859-1/guides/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 15:13:39 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Italian.tmpl"
 #include "../../common/guides/Imakefile.tmpl"

diff --git a/cde/doc/it_IT.ISO8859-1/help/Imakefile b/cde/doc/it_IT.ISO8859-1/help/Imakefile
index e8ec90b442d99567e519d5956ffea860be4f8542..d80996b3bb124a218ff93c86f6498e7750c8cd63 100644 (file)
--- a/cde/doc/it_IT.ISO8859-1/help/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 20:17:04 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Italian.tmpl"
 #include "../../common/help/Imakefile.tmpl"

diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl
index 5cd8316a7a051088627453f7ae8db5f6ea4ed2cd..b23489a0db9326ab89451fec62a3fc3bffd507d5 100644 (file)
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -4,25 +4,30 @@ XCOMM $XConsortium: French.tmpl /main/1 1995/12/08 09:41:35 rswiston $
  * variable for the French locale.
  */
 
-SOURCE_LANG=fr_FR.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=fr_FR.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=fr_FR.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=fr
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=fr_FR
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=fr_FR.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=fr_FR.UTF-8
+
 #ifdef SunArchitecture
 LANG=fr
 #endif
 
-#ifdef HPArchitecture
-LANG=fr_FR.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=fr_FR.UTF-8
 #endif
+
+#endif

diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl
index 9569d931258a4a3122e9b17230e2a0ff6553e458..e1974274c3cdfd64ed10dc087b9064e1923c2374 100644 (file)
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -4,25 +4,30 @@ XCOMM $XConsortium: German.tmpl /main/1 1995/12/08 09:41:46 rswiston $
  * variable for the German locale.
  */
 
-SOURCE_LANG=de_DE.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=de_DE.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=de_DE.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=de
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=de_DE
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=de_DE.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=de_DE.UTF-8
+
 #ifdef SunArchitecture
 LANG=de
 #endif
 
-#ifdef HPArchitecture
-LANG=de_DE.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=de_DE.UTF-8
 #endif
+
+#endif

diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl
index 8922b74e71db79c8100640dcaa255e1dda4c5437..65ad50ccf2d319400b1c0ed459f55d58104341f5 100644 (file)
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -4,25 +4,31 @@ XCOMM $XConsortium: Italian.tmpl /main/1 1995/12/08 09:41:55 rswiston $
  * variable for the Italian locale.
  */
 
-SOURCE_LANG=it_IT.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=it_IT.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=it_IT.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=it
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=it_IT
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=it_IT.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=it_IT.UTF-8
+
 #ifdef SunArchitecture
 LANG=it
 #endif
 
-#ifdef HPArchitecture
-LANG=it_IT.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=it_IT.UTF-8
 #endif
+
+
+#endif

diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl
index f7e0516964ea1d287e8ad7e21f9927e28741672a..2bc63e219cd3a615382f790827fb06271349138e 100644 (file)
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -4,25 +4,29 @@ XCOMM $XConsortium: Spanish.tmpl /main/1 1995/12/08 09:42:25 rswiston $
  * variable for the Spanish locale.
  */
 
-SOURCE_LANG=es_ES.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=es_ES.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=es_ES.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=es
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=es_ES
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=es_ES.ISO8859-1
 #endif
 
+#else
+
+SOURCE_LANG=es_ES.UTF-8
+
 #ifdef SunArchitecture
 LANG=es
 #endif
 
-#ifdef HPArchitecture
-LANG=es_ES.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=es_ES.UTF-8
 #endif
+
+#endif

diff --git a/cde/programs/localized/templates/Swedish.tmpl b/cde/programs/localized/templates/Swedish.tmpl
index 19d6b029f065d4c5f160f0fe5104b2b065fcd947..9b37ac765a2576a4731f75e1ebc59030e10d853d 100644 (file)
--- a/cde/programs/localized/templates/Swedish.tmpl
+++ b/cde/programs/localized/templates/Swedish.tmpl
@@ -4,21 +4,30 @@ XCOMM $XConsortium: Swedish.tmpl /main/1 1995/12/08 09:42:34 rswiston $
  * variable for the Swedish locale.
  */
 
+#if BuildingDocs
+
+XCOMM stick to ISO8859-1
 SOURCE_LANG=sv_SE.ISO8859-1
 
-#ifdef AlphaArchitecture
-LANG=sv_SE.ISO8859-1
+#ifdef SunArchitecture
+LANG=sv
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=sv_SE
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=sv_SE.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=sv_SE.UTF-8
+
 #ifdef SunArchitecture
 LANG=sv
 #endif
 
-#ifdef HPArchitecture
-LANG=sv_SE.iso88591
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=sv_SE.UTF-8
+#endif
+
 #endif