alter build system to add in menu entries strings

2 files changed, 13 insertions, 3 deletions

diff --git a/perl-install/standalone/po/Makefile b/perl-install/standalone/po/Makefile
index 21118e257..d3ed76960 100644
--- a/perl-install/standalone/po/Makefile
+++ b/perl-install/standalone/po/Makefile
@@ -4,6 +4,7 @@ NAME = libDrakX-standalone
 LOCALEDIR = $(DATADIR)/locale
 PMSFILES = $(STANDALONEPMS_)
 PMSFILES_HERE = $(wildcard $(PMSFILES:%=../%))
+top_srcdir=..
 
 MAIN_PO_FILES = ../../share/po/libDrakX.pot
 
@@ -23,10 +24,12 @@ merge: $(NAME).pot
 	  mv -f "$$n"t $$n ; \
 	done
 
-$(NAME).pot: $(PMSFILES_HERE)
+$(NAME).pot: $(PMSFILES_HERE) POTFILES.in
+	intltool-update --gettext-package desktopstuff --pot
 	cd .. ; perl_checker -q --generate-pot po/.$@ $(PMSFILES)
-	xgettext $(MAIN_PO_FILES:%=-x %) -o $@ .$@
-	rm -f .$@
+	xgettext $(MAIN_PO_FILES:%=-x %) -o ..$@ .$@
+	msgcat --use-first ..$@ desktopstuff.pot > $@
+	rm -f desktopstuff.pot $(NAME)_tmp.pot .$@ ..$@
 
 install: $(MOFILES)
 	for l in $(LANGS); do \
@@ -34,5 +37,9 @@ install: $(MOFILES)
 		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/$(NAME).mo; \
 	done
 
+POTFILES.in:
+	(cd .. ; /bin/ls data/*.desktop.in data/*.directory.in) > POTFILES.in
+
+
 clean:
 	@rm -rf *.mo $(POFILES:%=%t)
diff --git a/perl-install/standalone/po/POTFILES.in b/perl-install/standalone/po/POTFILES.in
new file mode 100644
index 000000000..2d36aa8cb
--- /dev/null
+++ b/perl-install/standalone/po/POTFILES.in
@@ -0,0 +1,3 @@
+menu/localedrake-system.desktop.in
+menu/harddrake.desktop.in
+menu/localedrake-user.desktop.in