Addition of the en_US.UTF-8 locale: installation support

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index ebd52e585464c6a0993b38d0c62653950e954f43..ac114b69754159e204a200c66383e6fd93d2578a 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -107,10 +107,15 @@ XCOMM build the DtXinerama support
 
 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.
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(BSDArchitecture)
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
+#if defined(LinuxArchitecture)
+# define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1 en_US.UTF-8
+# define UTF8_NLS_SUPPORT
+#endif
+
 #ifdef SunArchitecture
 #define HasCodeCenter        YES
 #define HasTestCenter        YES

diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb
index f9f127aa50ac801c6a12e5e7a403679bfdfd140c..79fce15775429c1db73ba0f44785f66ba60d1d67 100644 (file)
--- a/cde/databases/CDE-FONTS.udb
+++ b/cde/databases/CDE-FONTS.udb
@@ -215,6 +215,16 @@
 #
 # for Linux
 #
+#ifdef UTF8_NLS_SUPPORT
+programs/fontaliases/linux/en_US.UTF-8/fonts.alias
+{ linux
+       install_target = /usr/dt/config/xfonts/en_US.UTF-8/fonts.alias
+}
+programs/fontaliases/linux/en_US.UTF-8/fonts.dir
+{ linux
+       install_target = /usr/dt/config/xfonts/en_US.UTF-8/fonts.dir
+}
+#endif
 programs/fontaliases/linux/C/fonts.alias
 { linux
        install_target = /usr/dt/config/xfonts/C/fonts.alias

diff --git a/cde/databases/CDE-MSG-LOC.src b/cde/databases/CDE-MSG-LOC.src
index 2b61d8897bd5f23e24d5e45ab730298c651b1c61..2a0b120a68802926fcecec9b8988b3db7809ecbd 100644 (file)
--- a/cde/databases/CDE-MSG-LOC.src
+++ b/cde/databases/CDE-MSG-LOC.src
@@ -388,6 +388,20 @@ programs/localized/%_LANG_%/msg/fmt_tbl.cat
 { default
        install_target = /usr/dt/lib/nls/msg/%_LANG_%/fmt_tbl.cat
 }
+XCOMM ##########################################################################
+XCOMM en_US.UTF-8 locale: only directory is needed, rest of data comes from C
+XCOMM ##########################################################################
+#if defined(_ENGLISH_)
+#if defined(UTF8_NLS_SUPPORT)
+-
+{ default
+        type = directory
+        install_target = /usr/dt/lib/nls/msg/en_US.UTF-8
+        mode = 0555
+        status = ------
+}
+#endif
+#endif
 
 XCOMM ##########################################################################
 XCOMM 

diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index cc4f0c5b1f09ad624a60bf2f50e7c2bde58bd472..845e2ee44bdc5d43aedb04652b8beb3d2ba86f6a 100644 (file)
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -192,10 +192,15 @@ DBS = \
 clean::
        $(RM) *.db
 
+
+#if defined UTF8_NLS_SUPPORT
+# define UTF8_NLS_SUPPORT_OPT -DUTF8_NLS_SUPPORT
+#endif
+
 /*
  * Default locale (C)
  */
-LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_ENGLISH_
+LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_ENGLISH_ UTF8_NLS_SUPPORT_OPT
 CppSourceFile(CDE-LOC-C.tmp,CDE-LOC.src,$(LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-C.tmp,CDE-HELP-LOC.src,$(LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-C.tmp,CDE-MSG-LOC.src,$(LOC_CPP_LIST),)

diff --git a/cde/doc/en_US.UTF-8/Imakefile b/cde/doc/en_US.UTF-8/Imakefile
new file mode 100644 (file)
index 0000000..c29e500
--- /dev/null
+++ b/cde/doc/en_US.UTF-8/Imakefile
@@ -0,0 +1 @@
+XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $

diff --git a/cde/programs/fontaliases/linux/Imakefile b/cde/programs/fontaliases/linux/Imakefile
index 6532167c5d2f1b37646773ab9b60bda588fb5730..99007d897890609690860f137d5369313db416f2 100644 (file)
--- a/cde/programs/fontaliases/linux/Imakefile
+++ b/cde/programs/fontaliases/linux/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/09/13 16:34:13 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags  /**/
 
-SUBDIRS = C
+SUBDIRS = C en_US.UTF-8
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile b/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile
new file mode 100644 (file)
index 0000000..9d5b2ee
--- /dev/null
+++ b/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile
@@ -0,0 +1 @@
+XCOMM $XConsortium: Imakefile /main/3 1996/09/13 17:50:44 drk $

diff --git a/cde/programs/localized/en_US.UTF-8/Imakefile b/cde/programs/localized/en_US.UTF-8/Imakefile
new file mode 100644 (file)
index 0000000..e69de29