From: Jon Trulson <jon@radscan.com>
Date: Mon, 25 Nov 2019 01:53:41 +0000 (-0700)
Subject: localization: make FR, DE, IT, and ES app-defaults/ build
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e42c0cc1bee8b9d8c2fdb614e6477a6868e294ca;p=oweals%2Fcde.git

localization: make FR, DE, IT, and ES app-defaults/ build
---

diff --git a/cde/configure.ac b/cde/configure.ac
index 5a1f5b35..467d39ce 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -476,6 +476,14 @@ programs/localized/Makefile
 programs/localized/util/Makefile
 programs/localized/C/Makefile
 programs/localized/C/app-defaults/Makefile
+programs/localized/de_DE.UTF-8/Makefile
+programs/localized/de_DE.UTF-8/app-defaults/Makefile
+programs/localized/fr_FR.UTF-8/Makefile
+programs/localized/fr_FR.UTF-8/app-defaults/Makefile
+programs/localized/it_IT.UTF-8/Makefile
+programs/localized/it_IT.UTF-8/app-defaults/Makefile
+programs/localized/es_ES.UTF-8/Makefile
+programs/localized/es_ES.UTF-8/app-defaults/Makefile
 
 ])
 
diff --git a/cde/programs/localized/Makefile.am b/cde/programs/localized/Makefile.am
index eec5271b..5c3a5d6d 100644
--- a/cde/programs/localized/Makefile.am
+++ b/cde/programs/localized/Makefile.am
@@ -1,25 +1,21 @@
 SUBDIRS = util C
 
-if SOLARIS
-.NO_PARALLEL:
-endif
-
 if JAPANESE
 SUBDIRS += ja_JP.dt-eucJP
 endif
 
 if GERMAN
-SUBDIRS += de_DE.ISO8859-1
+SUBDIRS += de_DE.UTF-8
 endif
 
 if ITALIAN
-SUBDIRS += it_IT.ISO8859-1
+SUBDIRS += it_IT.UTF-8
 endif
 
 if SPANISH
-SUBDIRS += es_ES.ISO8859-1
+SUBDIRS += es_ES.UTF-8
 endif
 
 if FRENCH
-SUBDIRS += fr_FR.ISO8859-1
+SUBDIRS += fr_FR.UTF-8
 endif
diff --git a/cde/programs/localized/de_DE.ISO8859-1/Makefile.am b/cde/programs/localized/de_DE.ISO8859-1/Makefile.am
deleted file mode 100644
index 8e43dfba..00000000
--- a/cde/programs/localized/de_DE.ISO8859-1/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/de_DE.UTF-8/Makefile.am b/cde/programs/localized/de_DE.UTF-8/Makefile.am
new file mode 100644
index 00000000..8e43dfba
--- /dev/null
+++ b/cde/programs/localized/de_DE.UTF-8/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/de_DE.UTF-8/app-defaults/Makefile.am b/cde/programs/localized/de_DE.UTF-8/app-defaults/Makefile.am
new file mode 100644
index 00000000..1972b0b4
--- /dev/null
+++ b/cde/programs/localized/de_DE.UTF-8/app-defaults/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/German.am
+include ../../templates/app-defaults.am
+
diff --git a/cde/programs/localized/es_ES.ISO8859-1/Makefile.am b/cde/programs/localized/es_ES.ISO8859-1/Makefile.am
deleted file mode 100644
index 8e43dfba..00000000
--- a/cde/programs/localized/es_ES.ISO8859-1/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/es_ES.UTF-8/Makefile.am b/cde/programs/localized/es_ES.UTF-8/Makefile.am
new file mode 100644
index 00000000..8e43dfba
--- /dev/null
+++ b/cde/programs/localized/es_ES.UTF-8/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/es_ES.UTF-8/app-defaults/Makefile.am b/cde/programs/localized/es_ES.UTF-8/app-defaults/Makefile.am
new file mode 100644
index 00000000..711f4ff5
--- /dev/null
+++ b/cde/programs/localized/es_ES.UTF-8/app-defaults/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/Spanish.am
+include ../../templates/app-defaults.am
+
diff --git a/cde/programs/localized/fr_FR.ISO8859-1/Makefile.am b/cde/programs/localized/fr_FR.ISO8859-1/Makefile.am
deleted file mode 100644
index 8e43dfba..00000000
--- a/cde/programs/localized/fr_FR.ISO8859-1/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/fr_FR.UTF-8/Makefile.am b/cde/programs/localized/fr_FR.UTF-8/Makefile.am
new file mode 100644
index 00000000..8e43dfba
--- /dev/null
+++ b/cde/programs/localized/fr_FR.UTF-8/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/fr_FR.UTF-8/app-defaults/Makefile.am b/cde/programs/localized/fr_FR.UTF-8/app-defaults/Makefile.am
new file mode 100644
index 00000000..0412a3b4
--- /dev/null
+++ b/cde/programs/localized/fr_FR.UTF-8/app-defaults/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/French.am
+include ../../templates/app-defaults.am
+
diff --git a/cde/programs/localized/it_IT.ISO8859-1/Makefile.am b/cde/programs/localized/it_IT.ISO8859-1/Makefile.am
deleted file mode 100644
index efe276f0..00000000
--- a/cde/programs/localized/it_IT.ISO8859-1/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = types config msg app-defaults palettes backdrops
diff --git a/cde/programs/localized/it_IT.UTF-8/Makefile.am b/cde/programs/localized/it_IT.UTF-8/Makefile.am
new file mode 100644
index 00000000..8e43dfba
--- /dev/null
+++ b/cde/programs/localized/it_IT.UTF-8/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = msg app-defaults config types palettes backdrops
diff --git a/cde/programs/localized/it_IT.UTF-8/app-defaults/Makefile.am b/cde/programs/localized/it_IT.UTF-8/app-defaults/Makefile.am
new file mode 100644
index 00000000..3c59cad5
--- /dev/null
+++ b/cde/programs/localized/it_IT.UTF-8/app-defaults/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/Italian.am
+include ../../templates/app-defaults.am
+
diff --git a/cde/programs/localized/templates/French.am b/cde/programs/localized/templates/French.am
new file mode 100644
index 00000000..570ee535
--- /dev/null
+++ b/cde/programs/localized/templates/French.am
@@ -0,0 +1,17 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for a locale.
+
+if SOLARIS
+LANG=fr
+endif
+
+if LINUX
+LANG=fr_FR.UTF-8
+endif
+
+if BSD
+LANG=fr_FR.UTF-8
+endif
+
+SOURCE_LANG=fr_FR.ISO8859-1
+
diff --git a/cde/programs/localized/templates/German.am b/cde/programs/localized/templates/German.am
new file mode 100644
index 00000000..5bfefb8f
--- /dev/null
+++ b/cde/programs/localized/templates/German.am
@@ -0,0 +1,17 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for a locale.
+
+if SOLARIS
+LANG=de
+endif
+
+if LINUX
+LANG=de_DE.UTF-8
+endif
+
+if BSD
+LANG=de_DE.UTF-8
+endif
+
+SOURCE_LANG=de_DE.ISO8859-1
+
diff --git a/cde/programs/localized/templates/Italian.am b/cde/programs/localized/templates/Italian.am
new file mode 100644
index 00000000..8ec19134
--- /dev/null
+++ b/cde/programs/localized/templates/Italian.am
@@ -0,0 +1,17 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for a locale.
+
+if SOLARIS
+LANG=it
+endif
+
+if LINUX
+LANG=it_IT.UTF-8
+endif
+
+if BSD
+LANG=it_IT.UTF-8
+endif
+
+SOURCE_LANG=it_IT.ISO8859-1
+
diff --git a/cde/programs/localized/templates/Spanish.am b/cde/programs/localized/templates/Spanish.am
new file mode 100644
index 00000000..db222128
--- /dev/null
+++ b/cde/programs/localized/templates/Spanish.am
@@ -0,0 +1,17 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for a locale.
+
+if SOLARIS
+LANG=es
+endif
+
+if LINUX
+LANG=es_ES.UTF-8
+endif
+
+if BSD
+LANG=es_ES.UTF-8
+endif
+
+SOURCE_LANG=es_ES.ISO8859-1
+