From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 22 Mar 2012 17:05:45 +0000 (+0000)
Subject: Exceptionally hacky linux fix. gnu gencat is returning != 0 even when it's
X-Git-Tag: 2.2.0a~26^2~62^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc949fccd206eff9a6d0e1f1e7e2fcd1abe0a955;p=oweals%2Fcde.git

Exceptionally hacky linux fix. gnu gencat is returning != 0 even when it's
succeeding.
---

diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c
index 8a31625a..7e247d62 100644
--- a/cde/programs/localized/util/merge.c
+++ b/cde/programs/localized/util/merge.c
@@ -247,7 +247,13 @@ void cat_open ()
         sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile);
 #endif
         if ( system(line) != 0 )
+	{
+	/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
+	   even on success */
+#if !defined(linux)
            fatal("primary .tmsg file would not gencat\n",0,9);
+#endif
+	}
     }
 
     catfile[0] =  catopen("./.dt_pfile.cat",0);
@@ -260,7 +266,14 @@ void cat_open ()
         sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile);
 #endif
         if ( system(line) != 0 )
+	{
+	/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
+	   even on success */
+#if !defined(linux)
            fatal("default .tmsg file would not gencat\n",0,9);
+#endif
+	}
+
     }
 
     catfile[1] = catopen("./.dt_dfile.cat",0);