Start the message extraction from the toplevel source directory, so the file references are relative to that, instead of relative to this po-docs subdirectory. Also update/regenerate podfiles accordingly. --- po-docs/Makefile.am | 17 +++-- po-docs/language.mk | 2 +- po-docs/podfiles | 182 ++++++++++++++++++++++---------------------- 3 files changed, 101 insertions(+), 100 deletions(-) diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am index aaffa0520..028fbbcea 100644 --- a/po-docs/Makefile.am +++ b/po-docs/Makefile.am @@ -42,24 +42,25 @@ EXTRA_DIST = \ SUBDIRS = $(linguas) libguestfs-docs.pot: - $(PO4A_GETTEXTIZE) \ + cd $(top_srcdir) && $(PO4A_GETTEXTIZE) \ -f pod \ -M utf-8 -L utf-8 \ --package-name $(PACKAGE_NAME) \ --package-version $(PACKAGE_VERSION) \ --msgid-bugs-address libguestfs@redhat.com \ --copyright-holder "Red Hat Inc." \ - -p $@ \ + -p $(abs_srcdir)/$@ \ $(patsubst %,-m %,$(shell cat $(srcdir)/podfiles)) podfiles: Makefile rm -f $@ $@-t - find $(top_srcdir) -name '*.pod' | \ - grep -v /debian/ | \ - grep -v /libguestfs-1 | \ - grep -v /po-docs/ | \ + cd $(top_srcdir) && find . -name '*.pod' -printf '%P\n'| \ + grep -v ^debian/ | \ + grep -v ^libguestfs-1 | \ + grep -v ^po-docs/ | \ + grep -v ^stamp- | \ grep -v /stamp- \ - > $@-t - for f in `cat $(top_srcdir)/po/POTFILES-pl`; do echo $(top_srcdir)/$$f; done >> $@-t + > $(abs_srcdir)/$@-t + cat $(top_srcdir)/po/POTFILES-pl >> $@-t LC_ALL=C sort -o $@-t $@-t mv $@-t $@ diff --git a/po-docs/language.mk b/po-docs/language.mk index 354facafe..88d7d3431 100644 --- a/po-docs/language.mk +++ b/po-docs/language.mk @@ -206,7 +206,7 @@ virt-p2v.1: virt-p2v.pod virt-p2v-kernel-config.pod -f pod \ -M utf-8 -L utf-8 \ -k 0 \ - -m $(srcdir)/../$(shell grep '/$(notdir $@)$$' $(top_srcdir)/po-docs/podfiles) \ + -m $(top_srcdir)/$(shell grep '/$(notdir $@)$$' $(top_srcdir)/po-docs/podfiles) \ -p $< \ | $(SED) '0,/^=encoding/d' > $@ diff --git a/po-docs/podfiles b/po-docs/podfiles index b788b57d7..9bde01aab 100644 --- a/po-docs/podfiles +++ b/po-docs/podfiles @@ -1,91 +1,91 @@ -../align/virt-alignment-scan.pod -../appliance/libguestfs-make-fixed-appliance.pod -../builder/virt-builder-repository.pod -../builder/virt-builder.pod -../builder/virt-index-validate.pod -../cat/virt-cat.pod -../cat/virt-filesystems.pod -../cat/virt-log.pod -../cat/virt-ls.pod -../cat/virt-tail.pod -../common/mlcustomize/customize-options.pod -../common/mlcustomize/customize-synopsis.pod -../common/options/blocksize-option.pod -../common/options/key-option.pod -../common/options/keys-from-stdin-option.pod -../customize/virt-customize.pod -../daemon/guestfsd.pod -../df/virt-df.pod -../dib/virt-dib.pod -../diff/virt-diff.pod -../docs/guestfs-building.pod -../docs/guestfs-faq.pod -../docs/guestfs-hacking.pod -../docs/guestfs-internals.pod -../docs/guestfs-performance.pod -../docs/guestfs-recipes.pod -../docs/guestfs-release-notes-1.10.pod -../docs/guestfs-release-notes-1.12.pod -../docs/guestfs-release-notes-1.14.pod -../docs/guestfs-release-notes-1.16.pod -../docs/guestfs-release-notes-1.18.pod -../docs/guestfs-release-notes-1.20.pod -../docs/guestfs-release-notes-1.22.pod -../docs/guestfs-release-notes-1.24.pod -../docs/guestfs-release-notes-1.26.pod -../docs/guestfs-release-notes-1.28.pod -../docs/guestfs-release-notes-1.30.pod -../docs/guestfs-release-notes-1.32.pod -../docs/guestfs-release-notes-1.34.pod -../docs/guestfs-release-notes-1.36.pod -../docs/guestfs-release-notes-1.38.pod -../docs/guestfs-release-notes-1.4.pod -../docs/guestfs-release-notes-1.40.pod -../docs/guestfs-release-notes-1.42.pod -../docs/guestfs-release-notes-1.6.pod -../docs/guestfs-release-notes-1.8.pod -../docs/guestfs-release-notes-historical.pod -../docs/guestfs-security.pod -../docs/guestfs-testing.pod -../docs/internal-documentation.pod -../edit/virt-edit.pod -../erlang/examples/guestfs-erlang.pod -../examples/guestfs-examples.pod -../fish/guestfish-actions.pod -../fish/guestfish-commands.pod -../fish/guestfish-prepopts.pod -../fish/guestfish.pod -../fish/libguestfs-tools.conf.pod -../fish/virt-copy-in.pod -../fish/virt-copy-out.pod -../fish/virt-tar-in.pod -../fish/virt-tar-out.pod -../format/virt-format.pod -../fuse/guestmount.pod -../fuse/guestunmount.pod -../get-kernel/virt-get-kernel.pod -../gobject/guestfs-gobject.pod -../golang/examples/guestfs-golang.pod -../inspector/virt-inspector.pod -../java/examples/guestfs-java.pod -../lib/guestfs-actions.pod -../lib/guestfs-availability.pod -../lib/guestfs-structs.pod -../lib/guestfs.pod -../lua/examples/guestfs-lua.pod -../make-fs/virt-make-fs.pod -../ocaml/examples/guestfs-ocaml.pod -../perl/examples/guestfs-perl.pod -../python/examples/guestfs-python.pod -../rescue/virt-rescue.pod -../resize/virt-resize.pod -../ruby/examples/guestfs-ruby.pod -../sparsify/virt-sparsify.pod -../sysprep/sysprep-extra-options.pod -../sysprep/sysprep-operations.pod -../sysprep/virt-sysprep.pod -../test-tool/libguestfs-test-tool.pod -../tools/virt-list-filesystems -../tools/virt-list-partitions -../tools/virt-tar -../tools/virt-win-reg +align/virt-alignment-scan.pod +appliance/libguestfs-make-fixed-appliance.pod +builder/virt-builder-repository.pod +builder/virt-builder.pod +builder/virt-index-validate.pod +cat/virt-cat.pod +cat/virt-filesystems.pod +cat/virt-log.pod +cat/virt-ls.pod +cat/virt-tail.pod +common/mlcustomize/customize-options.pod +common/mlcustomize/customize-synopsis.pod +common/options/blocksize-option.pod +common/options/key-option.pod +common/options/keys-from-stdin-option.pod +customize/virt-customize.pod +daemon/guestfsd.pod +df/virt-df.pod +dib/virt-dib.pod +diff/virt-diff.pod +docs/guestfs-building.pod +docs/guestfs-faq.pod +docs/guestfs-hacking.pod +docs/guestfs-internals.pod +docs/guestfs-performance.pod +docs/guestfs-recipes.pod +docs/guestfs-release-notes-1.10.pod +docs/guestfs-release-notes-1.12.pod +docs/guestfs-release-notes-1.14.pod +docs/guestfs-release-notes-1.16.pod +docs/guestfs-release-notes-1.18.pod +docs/guestfs-release-notes-1.20.pod +docs/guestfs-release-notes-1.22.pod +docs/guestfs-release-notes-1.24.pod +docs/guestfs-release-notes-1.26.pod +docs/guestfs-release-notes-1.28.pod +docs/guestfs-release-notes-1.30.pod +docs/guestfs-release-notes-1.32.pod +docs/guestfs-release-notes-1.34.pod +docs/guestfs-release-notes-1.36.pod +docs/guestfs-release-notes-1.38.pod +docs/guestfs-release-notes-1.4.pod +docs/guestfs-release-notes-1.40.pod +docs/guestfs-release-notes-1.42.pod +docs/guestfs-release-notes-1.6.pod +docs/guestfs-release-notes-1.8.pod +docs/guestfs-release-notes-historical.pod +docs/guestfs-security.pod +docs/guestfs-testing.pod +docs/internal-documentation.pod +edit/virt-edit.pod +erlang/examples/guestfs-erlang.pod +examples/guestfs-examples.pod +fish/guestfish-actions.pod +fish/guestfish-commands.pod +fish/guestfish-prepopts.pod +fish/guestfish.pod +fish/libguestfs-tools.conf.pod +fish/virt-copy-in.pod +fish/virt-copy-out.pod +fish/virt-tar-in.pod +fish/virt-tar-out.pod +format/virt-format.pod +fuse/guestmount.pod +fuse/guestunmount.pod +get-kernel/virt-get-kernel.pod +gobject/guestfs-gobject.pod +golang/examples/guestfs-golang.pod +inspector/virt-inspector.pod +java/examples/guestfs-java.pod +lib/guestfs-actions.pod +lib/guestfs-availability.pod +lib/guestfs-structs.pod +lib/guestfs.pod +lua/examples/guestfs-lua.pod +make-fs/virt-make-fs.pod +ocaml/examples/guestfs-ocaml.pod +perl/examples/guestfs-perl.pod +python/examples/guestfs-python.pod +rescue/virt-rescue.pod +resize/virt-resize.pod +ruby/examples/guestfs-ruby.pod +sparsify/virt-sparsify.pod +sysprep/sysprep-extra-options.pod +sysprep/sysprep-operations.pod +sysprep/virt-sysprep.pod +test-tool/libguestfs-test-tool.pod +tools/virt-list-filesystems +tools/virt-list-partitions +tools/virt-tar +tools/virt-win-reg -- 2.26.2