Mercurial > mplayer.hg
changeset 26804:e49511beeb68
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.
| author | diego |
|---|---|
| date | Mon, 19 May 2008 00:07:17 +0000 |
| parents | 91d6ee54e94d |
| children | 9ee2a073c09c |
| files | Makefile |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon May 19 00:05:18 2008 +0000 +++ b/Makefile Mon May 19 00:07:17 2008 +0000 @@ -765,14 +765,13 @@ @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