X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2FMakefile.in.in;h=4b056c4904c6c4c90cca614a4c6a68130b2dc6ea;hb=ede3d57013ab9046561a6b12861b5ba3e695b858;hp=b16596ed94e982d3776d28e5f76ad6dcd42aa03c;hpb=179ae3e843cd36570d2ff37291103de2c3322db6;p=lyx.git

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index b16596ed94..4b056c4904 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -48,7 +48,8 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-$(POFILES) $(GMOFILES)
+$(POFILES) $(GMOFILES) xforms_l10n.pot qt_l10n.pot layouts_l10n.pot \
+languages_l10n.pot default_ui_l10n.pot
 
 POTFILE_IN_DEPS = $(shell find $(top_srcdir)/src -name Makefile.am)
 
@@ -89,10 +90,10 @@ all-no:
 $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in l10n_pots
 	$(XGETTEXT) --join-existing --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --escape --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in \
+	  --keyword=qt_ --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot || true)
 
 install: install-exec install-data
 install-exec:
@@ -201,15 +202,14 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
 	     grep -l "_(\".*\")" `find src -name \*.[hHC] -print` |\
 	     sed -e '/xforms.forms/d' | \
 	     sort -f -n | uniq ) > $@-t \
-	&& echo "src/ext_l10n.h" >> $@-t \
 	&& mv $@-t $@
 
 
-l10n_pots: xforms_l10n.pot qt_l10n.pot layouts_l10n.pot languages_l10n.pot default_ui_l10n.pot
-	cat xforms_l10n.pot qt_l10n.pot layouts_l10n.pot languages_l10n.pot default_ui_l10n.pot | \
+l10n_pots: $(srcdir)/xforms_l10n.pot $(srcdir)/qt_l10n.pot $(srcdir)/layouts_l10n.pot $(srcdir)/languages_l10n.pot $(srcdir)/default_ui_l10n.pot
+	cat $(srcdir)/xforms_l10n.pot $(srcdir)/qt_l10n.pot $(srcdir)/layouts_l10n.pot $(srcdir)/languages_l10n.pot $(srcdir)/default_ui_l10n.pot | \
 	msguniq -o $(PACKAGE).po
 
-xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
+$(srcdir)/xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 	awk ' \
 	     BEGIN { \
 		     print "#, fuzzy"; \
@@ -228,7 +228,7 @@ xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 	     }' \
 	`find $(top_srcdir)/src/frontends/xforms/forms -name \*.fd` > $@
 
-qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
+$(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 	awk ' \
 	     /<string>/ { \
 	             line=$$0; \
@@ -243,7 +243,7 @@ qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 	     }' \
 	`find $(top_srcdir)/src/frontends/qt2/ui -name \*.ui` > $@
 
-layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
+$(srcdir)/layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
 	awk ' \
 	    /^Style / { \
 		line=$$0; \
@@ -259,7 +259,7 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
 	    } \
 	    ' `find $(top_srcdir)/lib/layouts -regex ".*\.\(layout\|inc\)"` > $@
 
-languages_l10n.pot: $(top_srcdir)/lib/languages
+$(srcdir)/languages_l10n.pot: $(top_srcdir)/lib/languages
 	awk ' \
 	    /^#/ { \
                 next; \
@@ -272,16 +272,16 @@ languages_l10n.pot: $(top_srcdir)/lib/languages
 	    } \
             '  $(top_srcdir)/lib/languages > $@
 
-default_ui_l10n.pot: $(top_srcdir)/lib/ui/default.ui
+$(srcdir)/default_ui_l10n.pot: $(top_srcdir)/lib/ui/default.ui
 	awk ' \
-	    /SubMenu/ { \
+	    /^[^#]*Submenu/ { \
 		line=$$0; \
                 sub(/[^"]*"/, "", line); \
                 sub(/".*/, "", line); \
 	        printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
                        FILENAME, FNR, line); \
             } \
-            /Item/ { \
+            /^[^#]*Item/ { \
 		line=$$0; \
                 sub(/[^"]*"/, "", line); \
                 sub(/".*/, "", line); \