Fri Nov 3 22:52:35 CET 2006

Author: kraymer
Date: Fri Nov  3 22:52:35 2006
New Revision: 20650

Removed:
   trunk/help/help_mp-en.h.charset
Modified:
   trunk/Makefile
   trunk/configure

Changes in other areas also in this revision:
Removed:
   trunk/help/help_mp-bg.h.charset
   trunk/help/help_mp-cs.h.charset
   trunk/help/help_mp-de.h.charset
   trunk/help/help_mp-dk.h.charset
   trunk/help/help_mp-el.h.charset
   trunk/help/help_mp-es.h.charset
   trunk/help/help_mp-fr.h.charset
   trunk/help/help_mp-hu.h.charset
   trunk/help/help_mp-it.h.charset
   trunk/help/help_mp-ja.h.charset
   trunk/help/help_mp-ko.h.charset
   trunk/help/help_mp-mk.h.charset
   trunk/help/help_mp-nb.h.charset
   trunk/help/help_mp-nl.h.charset
   trunk/help/help_mp-pl.h.charset
   trunk/help/help_mp-pt_BR.h.charset
   trunk/help/help_mp-ro.h.charset
   trunk/help/help_mp-ru.h.charset
   trunk/help/help_mp-sk.h.charset
   trunk/help/help_mp-sv.h.charset
   trunk/help/help_mp-tr.h.charset
   trunk/help/help_mp-uk.h.charset
   trunk/help/help_mp-zh_CN.h.charset
   trunk/help/help_mp-zh_TW.h.charset

Log:
remove charset files (all of them are in UTF-8 now anyway)
change build system accordingly


Modified: trunk/Makefile
==============================================================================

--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Nov  3 22:52:35 2006
@@ -443,7 +443,7 @@
 ifeq ($(CHARSET),)
 	@echo '#include "$(HELP_FILE)"' >> help_mp.h
 else
-	iconv -f `cat $(HELP_FILE).charset` -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
+	iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
 endif
 
 ifneq ($(HELP_FILE),help/help_mp-en.h)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Nov  3 22:52:35 2006
@@ -7151,8 +7151,6 @@
   _charset=""
 elif test -z "$_charset" ; then
   if test "$_gtk1" = yes ; then
-    _charset=`cat ${_mp_help}.charset`
-  else
     _charset="UTF-8"
   fi
 fi
@@ -7162,18 +7160,18 @@
   _def_charset="#undef MSG_CHARSET"
 fi
 
-if test "$_charset" = `cat ${_mp_help}.charset` ; then
+if test "$_charset" = "UTF-8" ; then
   # hack to disable conversion in the Makefile
   _charset=""
 fi
 
 if test "$_charset" ; then
 echocheck "iconv program"
-iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
+iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
 if test "$?" -ne 0 ; then
   echores "no"
     echo "No working iconv program found, use "
-    echo "--charset=`cat ${_mp_help}.charset` to continue anyway."
+    echo "--charset=UTF-8 to continue anyway."
     echo "If you also have problems with iconv library functions use --charset=noconv."
     echo "Messages in the GTK-2 interface will be broken then."
     exit 1

