From 7ee2f3e80d776275fd0bd4541b20f4ab43e05c01 Mon Sep 17 00:00:00 2001 From: Pascal Stumpf Date: Sun, 19 Aug 2012 19:35:38 +0200 Subject: [PATCH] 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. --- cde/config/cf/OpenBSD.cf | 4 ---- cde/config/cf/site.def | 2 +- cde/programs/localized/templates/header2.tmpl | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf index dab1cecc4..163c40b8e 100644 --- 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 e18d4afda..1c7643baa 100644 --- 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 753f11b31..a7d30198c 100644 --- 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; \ @@\