summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-19 00:07:17 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-19 00:07:17 +0000
commit745662aafa3ad219b72571ba9caad278f3521e11 (patch)
tree00d07e4abdf9c748e1a5b6a62d59e6ad04cb0bed /Makefile
parentab36efa0d7d8b511d56cf2fbd3c3d094704eb88e (diff)
downloadmpv-745662aafa3ad219b72571ba9caad278f3521e11.tar.bz2
mpv-745662aafa3ad219b72571ba9caad278f3521e11.tar.xz
If character set conversion for help_mp.h is required, do it on the whole
file including the parts added from the English master file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26836 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index dfe3197532..608e777ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -765,14 +765,13 @@ help_mp.h: help/help_mp-en.h $(HELP_FILE)
@echo '// See the help/ subdir for the editable files.' >> $@
@echo '#ifndef MPLAYER_HELP_MP_H' >> $@
@echo '#define MPLAYER_HELP_MP_H' >> $@
-ifeq ($(CHARSET),UTF-8)
- @echo '#include "$(HELP_FILE)"' >> $@
-else
- iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> $@
-endif
+ @cat "$(HELP_FILE)" >> $@
@echo '// untranslated messages from the English master file:' >> $@
help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> $@
@echo '#endif /* MPLAYER_HELP_MP_H */' >> $@
+ifneq ($(CHARSET),UTF-8)
+ iconv -f UTF-8 -t $(CHARSET) $@ > $@.tmp; mv $@.tmp $@
+endif