Fix localized build on OpenBSD.

Use the same set of langs as on Linux and FreeBSD (no Japanese), don't
redefine a needed macro as no-op, and unset LC_CTYPE in the environment
when building cat files.

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index dab1cecc48ab6f2938b52d9e1f7e608710b46a3a..163c40b8eec551efa19e34b458a087b78b5fd42f 100644 (file)
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1024,10 +1024,6 @@ install:: fonts.alias                                                    @@\
 
 #define BuildLibPathVar        LD_LIBRARY_PATH
 
-#ifndef RandomMotifMessageCatalogRule
-#define RandomMotifMessageCatalogRule(target)
-#endif
-
 #ifndef KornShell
 #define KornShell               /usr/local/bin/ksh93
 #endif

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index e18d4afdafd47de9f625f72c664bd52ecdb18c82..1c7643baa2e3d2d23712fba759779735ca9d876a 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -90,7 +90,7 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 
 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(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 

diff --git a/cde/programs/localized/templates/header2.tmpl b/cde/programs/localized/templates/header2.tmpl
index 753f11b31b38cc9ff466132fc715543624b7d443..a7d30198cfbc15bee5d19aea11ab19b14b5953f4 100644 (file)
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -14,6 +14,8 @@ target.cat : target.msg                                                       @@\
        @echo "Running mkcatdefs for $@ with LANG set to $(LANG)"       @@\
        ( \                                                             @@\
          rm -f $@ target.tmp.msg; \                                    @@\
+         LC_CTYPE=""; \                                                @@\
+         export LC_CTYPE; \                                            @@\
          LANG=$(LANG); \                                               @@\
          export LANG; \                                                @@\
          $(MKCATTOOL) $(@:.cat=) $(@:.cat=.msg) -h > target.tmp.msg; \ @@\