Fix the dependencies of the libguestfs.pot target: other than using the right make variables holding the contents of the POTFILES, depend also on the POTFILES themselves. --- po/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/Makefile.am b/po/Makefile.am index b0a8038..a8343ec 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ --directory=$(top_srcdir) -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) rm -f $@-t if HAVE_OCAML_GETTEXT $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML)

On Thu, Dec 05, 2013 at 07:02:28PM +0100, Pino Toscano wrote: > On Thursday 05 December 2013 15:53:58 Richard W.M. Jones wrote: > > On Thu, Dec 05, 2013 at 04:30:05PM +0100, Pino Toscano wrote: > > > Fix the dependencies of the libguestfs.pot target: other than > > > using > > > the right make variables holding the contents of the POTFILES, > > > depend also on the POTFILES themselves. > > > --- > > > > > > po/Makefile.am | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/po/Makefile.am b/po/Makefile.am > > > index b0a8038..a8343ec 100644 > > > --- a/po/Makefile.am > > > +++ b/po/Makefile.am > > > @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ > > > > > > --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ > > > --directory=$(top_srcdir) > > > > > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) > > > $(POTFILES-ml) > > > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl > > > $(POTFILES_PL) POTFILES-ml $(POTFILES_ML)> > > > > > > rm -f $@-t > > > > > > if HAVE_OCAML_GETTEXT > > > > > > $(OCAML_GETTEXT) --action extract --extract-pot $@-t > > > $(POTFILES_ML) > > > > So I agree that $(POTFILES-pl) is definitely wrong. Not sure > > exactly > > what we were thinking about there ... > > > > But, won't the addition of the literal file names break separate > > compilation? In particular, $(POTFILES_PL) is supposed to be the > > correct path to the file POTFILES-pl (and correspondingly for the > > other files), so it shouldn't be necessary to list both > > POTFILES-pl > > and $(POTFILES_PL). This ^^ is bogus. I misunderstood the $(SED) in the macros. Obviously $(POTFILES) expands to the contents of the POTFILES file, ie. a list of filenames. > The idea behind the addition is make the libguestfs.pot generation > dependent on both the POTFILES files and the actual sources, so > either adding a new source to any POTFILES or changing any of the > listed sources in any POTFILES will trigger a new pot rebuild. Right, so I believe the first version (posted above) is correct, because $(srcdir)/.. is not necessary (because automake is supposed to add a VPATH for these builds). Which apparently are called "VPATH builds", not separate compilation.

If you agree, I will push the first version of the 2/3 patch.

- when a command needs no parameters, tell that explicitly instead of "command should have 0 parameters" - use gettext's plural form when printing the number of required arguments - improve the error message for a variable number of parameters limited only in the maximum number of them, using also a plural form --- generator/fish.ml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/generator/fish.ml b/generator/fish.ml index 65f1acb..da0584b 100644 --- a/generator/fish.ml +++ b/generator/fish.ml @@ -362,12 +362,24 @@ Guestfish will prompt for these separately." if argc_minimum = argc_maximum then ( pr " if (argc != %d) {\n" argc_minimum; - pr " fprintf (stderr, _(\"%%s should have %%d parameter(s)\\n\"), cmd, %d);\n" - argc_minimum; + if argc_minimum = 0 then ( + pr " fprintf (stderr, _(\"%%s should have no parameters\\n\"), cmd);\n"; + ) else ( + pr " fprintf (stderr, ngettext(\"%%s should have %%d parameter\\n\",\n"; + pr " \"%%s should have %%d parameters\\n\",\n"; + pr " %d),\n" + argc_minimum; + pr " cmd, %d);\n" + argc_minimum; + ) ) else if argc_minimum = 0 then ( pr " if (argc > %d) {\n" argc_maximum; - pr " fprintf (stderr, _(\"%%s should have %%d-%%d parameter(s)\\n\"), cmd, %d, %d);\n" - argc_minimum argc_maximum; + pr " fprintf (stderr, ngettext(\"%%s should have at most %%d parameter\\n\",\n"; + pr " \"%%s should have at most %%d parameters\\n\",\n"; + pr " %d),\n" + argc_maximum; + pr " cmd, %d);\n" + argc_maximum; ) else ( pr " if (argc < %d || argc > %d) {\n" argc_minimum argc_maximum; pr " fprintf (stderr, _(\"%%s should have %%d-%%d parameter(s)\\n\"), cmd, %d, %d);\n" -- 1.8.3.1