Hilko Bengen
2013-Dec-09 19:52 UTC
[Libguestfs] [PATCH 1/3] Fix manpage generation in out-of-tree builds
--- po-docs/ja/Makefile.am | 16 ++++++++-------- po-docs/uk/Makefile.am | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am index 820f91a..e954f04 100644 --- a/po-docs/ja/Makefile.am +++ b/po-docs/ja/Makefile.am @@ -92,9 +92,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru --man $@ \ --section 3 \ --license LGPLv2+ \ - --insert guestfs-actions.pod:__ACTIONS__ \ - --insert guestfs-availability.pod:__AVAILABILITY__ \ - --insert guestfs-structs.pod:__STRUCTS__ \ + --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \ + --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \ + --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \ $< guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfish-prepopts.pod @@ -102,9 +102,9 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis --no-strict-checks \ --man $@ \ --license GPLv2+ \ - --insert guestfish-actions.pod:__ACTIONS__ \ - --insert guestfish-commands.pod:__FISH_COMMANDS__ \ - --insert guestfish-prepopts.pod:__PREPOPTS__ \ + --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \ + --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \ + --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \ $< virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod @@ -112,8 +112,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po --no-strict-checks \ --man $@ \ --license GPLv2+ \ - --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \ - --insert sysprep-operations.pod:__OPERATIONS__ \ + --insert $(srcdir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \ + --insert $(srcdir)/sysprep-operations.pod:__OPERATIONS__ \ $< %.1: %.pod diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am index 820f91a..e954f04 100644 --- a/po-docs/uk/Makefile.am +++ b/po-docs/uk/Makefile.am @@ -92,9 +92,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru --man $@ \ --section 3 \ --license LGPLv2+ \ - --insert guestfs-actions.pod:__ACTIONS__ \ - --insert guestfs-availability.pod:__AVAILABILITY__ \ - --insert guestfs-structs.pod:__STRUCTS__ \ + --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \ + --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \ + --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \ $< guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfish-prepopts.pod @@ -102,9 +102,9 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis --no-strict-checks \ --man $@ \ --license GPLv2+ \ - --insert guestfish-actions.pod:__ACTIONS__ \ - --insert guestfish-commands.pod:__FISH_COMMANDS__ \ - --insert guestfish-prepopts.pod:__PREPOPTS__ \ + --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \ + --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \ + --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \ $< virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod @@ -112,8 +112,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po --no-strict-checks \ --man $@ \ --license GPLv2+ \ - --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \ - --insert sysprep-operations.pod:__OPERATIONS__ \ + --insert $(srcdir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \ + --insert $(srcdir)/sysprep-operations.pod:__OPERATIONS__ \ $< %.1: %.pod -- 1.8.5.1
Hilko Bengen
2013-Dec-09 19:52 UTC
[Libguestfs] [PATCH 2/3] Fix builder/website test in out-of-tree builds
--- builder/website/validate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/website/validate.sh b/builder/website/validate.sh index f09e30c..1c535e7 100755 --- a/builder/website/validate.sh +++ b/builder/website/validate.sh @@ -19,6 +19,6 @@ export LANG=C set -e -../virt-index-validate index -../virt-index-validate index.asc +../virt-index-validate $srcdir/index +../virt-index-validate $srcdir/index.asc -- 1.8.5.1
Hilko Bengen
2013-Dec-09 19:52 UTC
[Libguestfs] [PATCH 3/3] Create empty files to be edited by xgettext
This avoids:
xgettext: error while opening "libguestfs.pot-t" for reading: No
such file or directory
which I observed with xgettext (GNU gettext-tools) 0.18.3
---
po/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/po/Makefile.am b/po/Makefile.am
index a8343ec..fd69441 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -67,6 +67,7 @@ XGETTEXT_ARGS = \
$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL)
POTFILES-ml $(POTFILES_ML)
rm -f $@-t
+ touch $@-t
if HAVE_OCAML_GETTEXT
$(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML)
endif
--
1.8.5.1
Richard W.M. Jones
2013-Dec-10 10:24 UTC
Re: [Libguestfs] [PATCH 3/3] Create empty files to be edited by xgettext
On Mon, Dec 09, 2013 at 08:52:35PM +0100, Hilko Bengen wrote:> This avoids: > > xgettext: error while opening "libguestfs.pot-t" for reading: No such file or directory > > which I observed with xgettext (GNU gettext-tools) 0.18.3 > --- > po/Makefile.am | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/po/Makefile.am b/po/Makefile.am > index a8343ec..fd69441 100644 > --- a/po/Makefile.am > +++ b/po/Makefile.am > @@ -67,6 +67,7 @@ XGETTEXT_ARGS = \ > > $(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) > rm -f $@-t > + touch $@-t > if HAVE_OCAML_GETTEXT > $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML) > endif > -- > 1.8.5.1ACK to all 3 patches. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top