intl: fix the broken build

Makefile

@@ -555,21 +555,12 @@ MD-WIZARD   = $(patsubst docs/wizard/%.md,%,$(wildcard docs/wizard/*.md))
 #
 # Internationalization
 #
-PO-FILES = $(foreach f,$(LANGUAGES),intl/tvheadend.$(f).po)
-PO-FILES += $(foreach f,$(LANGUAGES),intl/docs/tvheadend.doc.$(f).po)
+PO-FILES  = $(wildcard $(foreach f,$(LANGUAGES),intl/tvheadend.$(f).po))
+PO-FILES += $(wildcard $(foreach f,$(LANGUAGES-DOC),intl/docs/tvheadend.doc.$(f).po))
 SRCS += src/tvh_locale.c
 
 POC_PY=PYTHONIOENCODING=utf-8 $(PYTHON) support/poc.py
 
-define merge-po
-	@if ! test -r "$(1)"; then \
-		sed -e 's/Content-Type: text\/plain; charset=CHARSET/Content-Type: text\/plain; charset=utf-8/' < "$(2)" > "$(1).new"; \
-	else \
-		$(MSGMERGE) -o $(1).new $(1) $(2); \
-	fi
-	@mv $(1).new $(1)
-endef
-
 #
 # Add-on modules
 #
@@ -723,33 +714,6 @@ intl:
 
 intl/tvheadend.pot:
 
-#intl/tvheadend.en_GB.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.de.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.fr.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.cs.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.pl.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.bg.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.he.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.hr.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
-#intl/tvheadend.it.po: intl/tvheadend.pot
-#	$(call merge-po,$@,$<)
-
 $(BUILDDIR)/src/tvh_locale.o: src/tvh_locale_inc.c
 src/tvh_locale_inc.c: $(PO-FILES)
 	@printf "Building $@\n"

intl/docs/tvheadend.doc.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-13 10:39+0200\n"
+"POT-Creation-Date: 2016-04-13 12:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"