summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile22
-rw-r--r--epgsearch.c2
2 files changed, 10 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index ef8bcd3..e21b81a 100644
--- a/Makefile
+++ b/Makefile
@@ -140,13 +140,8 @@ $(DEPFILE): Makefile
PODIR = po
LOCALEDIR = $(VDRDIR)/locale
I18Npo = $(wildcard $(PODIR)/*.po)
-I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/$(PLUGIN).pot
-I18Nvdrmo = vdr-$(PLUGIN).mo
-ifeq ($(strip $(APIVERSION)),1.5.7)
- I18Nvdrmo = $(PLUGIN).mo
-endif
%.mo: %.po
msgfmt -c -o $@ $<
@@ -154,15 +149,16 @@ endif
$(I18Npot): $(wildcard *.[ch])
xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<cwieninger@gmx.de>' -o $@ $(wildcard *.[ch])
-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+ @touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ @mkdir -p $(dir $@)
+ cp $< $@
-i18n: $(I18Nmo)
- @mkdir -p $(LOCALEDIR)
- for i in $(I18Ndirs); do\
- mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
- cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(I18Nvdrmo);\
- done
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
buildutil/pot2i18n.pl $(I18Npot) i18n-template.h > i18n-generated.h
diff --git a/epgsearch.c b/epgsearch.c
index ad8f578..cac0c21 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -66,7 +66,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "menu_announcelist.h"
#include "confdloader.h"
-static const char VERSION[] = "0.9.24.beta22";
+static const char VERSION[] = "0.9.24.beta23";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals