From: Marcin Cieslak <saper@saper.info>
Date: Wed, 15 Aug 2012 01:30:48 +0000 (+0200)
Subject: Deal with *.tmp.msg after mkcatdefs failure
X-Git-Tag: 2.2.0b~82^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2562c2cbeb35ff38a09444e55515c0577a2fe9d9;p=oweals%2Fcde.git

Deal with *.tmp.msg after mkcatdefs failure

BSD make interrupts shell pipeline after
if it cannot run the command:

rm -f Mrm.msg
ln -s ../../../../imports/motif/localized/de_DE.ISO8859-1/msg/Mrm.msg Mrm.msg
Running mkcatdefs for Mrm.cat with LANG set to de_DE.ISO8859-1
(  rm -f Mrm.cat Mrm.tmp.msg;  LANG=de_DE.ISO8859-1;  export LANG;  ../../../../imports/motif/localized/util/mkcatdefs Mrm Mrm.msg -h > Mrm.tmp.msg;  gencat  Mrm.cat Mrm.tmp.msg;  rm -f Mrm.tmp.msg  )
../../../../imports/motif/localized/util/mkcatdefs: not found
*** Error code 127

After this, an empty Mrm.tmp.msg is left.
---

diff --git a/cde/.gitignore b/cde/.gitignore
index 9aa2dd75..46827178 100644
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -131,6 +131,16 @@ programs/dtwm/dtwm
 programs/localized/C/types/*.dt
 programs/localized/C/types/*.dt.tmsg
 programs/localized/C/types/*.nls
+programs/localized/ls /msg/*.nls
+programs/localized/de_DE.ISO8859-1/msg/*.tmp.msg
+programs/localized/es_ES.ISO8859-1/msg/*.tmp.msg
+programs/localized/fr_FR.ISO8859-1/msg/*.tmp.msg
+programs/localized/it_IT.ISO8859-1/msg/*.tmp.msg
+programs/localized/ja_JP.dt-eucJP/msg/*.tmp.msg
+programs/localized/ko_KR.dt-eucKR/msg/*.tmp.msg
+programs/localized/sv_SE.ISO8859-1/msg/*.tmp.msg
+programs/localized/zh_CN.dt-eucCN/msg/*.tmp.msg
+programs/localized/zh_TW.dt-eucTW/msg/*.tmp.msg
 
 # dtappbuilder
 programs/dtappbuilder/src/ab/.dtcodegen.log
diff --git a/cde/programs/localized/templates/msg.tmpl b/cde/programs/localized/templates/msg.tmpl
index 697f4575..f9987c71 100644
--- a/cde/programs/localized/templates/msg.tmpl
+++ b/cde/programs/localized/templates/msg.tmpl
@@ -7,5 +7,6 @@ RandomMessageCatalogRule()
 
 clean::
 	$(RM) *.cat
+	$(RM) *.tmp.msg
 
 depend::