Re: langs.XX.po data doubled in countries.XX.po
On Tue, Nov 05, 2002 at 04:49:48PM +0100, Josip Rodin wrote:
> On Tue, Nov 05, 2002 at 04:12:32PM +0100, Denis Barbier wrote:
> > > In order to prevent such problems, we could put english/po/*.pot files
> > > under CVS control, instead of updating them automatically. Comments?
> >
> > I now strongly believe that POT files should be committed :))
> > Will do later today, unless there are good reasons to keep them away.
>
> Won't they cause CVS conflicts regularly?
If they are committed, I will also apply this patch. So problems could
only occur once.
When English text is modified, authors will have to run 'make pot' and
commit POT files.
Denis
Index: english/po/Makefile
===================================================================
RCS file: /cvs/webwml/webwml/english/po/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- english/po/Makefile 5 Nov 2002 13:02:02 -0000 1.30
+++ english/po/Makefile 5 Nov 2002 16:11:05 -0000
@@ -50,37 +50,37 @@
all install:: $(POTFILES) install-mo
endif
-$(ENGLISHDIR)/po/templates.pot: $(templates_FILES)
+$(ENGLISHDIR)/po/templates.pot: # $(templates_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(templates_FILES) > $@
-$(ENGLISHDIR)/po/bugs.pot: $(bugs_FILES)
+$(ENGLISHDIR)/po/bugs.pot: # $(bugs_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(bugs_FILES) > $@
-$(ENGLISHDIR)/po/countries.pot: $(countries_FILES)
+$(ENGLISHDIR)/po/countries.pot: # $(countries_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(countries_FILES) > $@
-$(ENGLISHDIR)/po/doc.pot: $(doc_FILES)
+$(ENGLISHDIR)/po/doc.pot: # $(doc_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(doc_FILES) > $@
-$(ENGLISHDIR)/po/l10n.pot: $(l10n_FILES)
+$(ENGLISHDIR)/po/l10n.pot: # $(l10n_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(l10n_FILES) > $@
-$(ENGLISHDIR)/po/langs.pot: $(langs_FILES)
+$(ENGLISHDIR)/po/langs.pot: # $(langs_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(langs_FILES) > $@
-$(ENGLISHDIR)/po/organization.pot: $(organization_FILES)
+$(ENGLISHDIR)/po/organization.pot: # $(organization_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(organization_FILES) > $@
-$(ENGLISHDIR)/po/ports.pot: $(ports_FILES)
+$(ENGLISHDIR)/po/ports.pot: # $(ports_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(ports_FILES) > $@
-$(ENGLISHDIR)/po/search.pot: $(search_FILES)
+$(ENGLISHDIR)/po/search.pot: # $(search_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(search_FILES) > $@
-$(ENGLISHDIR)/po/vendors.pot: $(vendors_FILES)
+$(ENGLISHDIR)/po/vendors.pot: # $(vendors_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(vendors_FILES) > $@
-$(ENGLISHDIR)/po/others.pot: $(others_FILES)
+$(ENGLISHDIR)/po/others.pot: # $(others_FILES)
$(ENGLISHDIR)/po/wmlxgettext.pl $(others_FILES) > $@
%.mo: %.$(LANGUAGE).po $(ENGLISHDIR)/po/%.pot
@@ -110,6 +110,10 @@
clean::
-rm -f *.pot *.mo
+
+pot:
+ -rm -f $(POTFILES)
+ $(MAKE) $(POTFILES)
ifeq "$(LANGUAGE)" "en"
stats:
Reply to: