summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rwxr-xr-xconfigure6
2 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9f06097596..3df07e3e88 100644
--- a/Makefile
+++ b/Makefile
@@ -399,7 +399,11 @@ doxygen_clean:
help_mp.h: help/help_mp-en.h $(HELP_FILE)
@echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h
@echo '// See the help/ subdir for the editable files.' >> help_mp.h
+ifeq ($(CHARSET),)
@echo '#include "$(HELP_FILE)"' >> help_mp.h
+else
+ iconv -f `cat $(HELP_FILE).charset` -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
+endif
ifneq ($(HELP_FILE),help/help_mp-en.h)
@echo "Adding untranslated messages to help_mp.h"
diff --git a/configure b/configure
index 1c66595c84..20491f490d 100755
--- a/configure
+++ b/configure
@@ -285,6 +285,7 @@ Miscellaneous options:
--target=PLATFORM target platform (i386-linux, arm-linux, etc)
--enable-static build a statically linked binary. Set further linking
options with --enable-static="-lslang -lncurses"
+ --charset convert the help messages to this charset
--language=list a white space or comma separated list of languages
for translated man pages, the first language is the
primary and therefore used for translated messages
@@ -1383,6 +1384,7 @@ _largefiles=no
#_language=en
_shm=auto
_linux_devfs=no
+#_charset=utf8
_i18n=auto
_dynamic_plugins=no
_crash_debug=auto
@@ -1682,6 +1684,9 @@ for ac_option do
--enable-sortsub) _sortsub=yes ;;
--disable-sortsub) _sortsub=no ;;
+ --charset=*)
+ _charset=`echo $ac_option | cut -d '=' -f 2`
+ ;;
--language=*)
_language=`echo $ac_option | cut -d '=' -f 2`
;;
@@ -6649,6 +6654,7 @@ INSTALL = $_install
EXTRA_INC = $_inc_extra $_inc_gtk
OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
STRIPBINARIES = $_stripbinaries
+CHARSET = $_charset
HELP_FILE = $_mp_help
PRG = $_prg