[Libguestfs] [v2v PATCH 08/14] po-docs: fix references to sources

[Pino Toscano]

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.

In addition, remove the reference to POTFILES-pl, as there are no Perl
sources in virt-v2v.

Also update/regenerate podfiles accordingly.
---
 po-docs/Makefile.am | 16 ++++++++--------
 po-docs/language.mk |  2 +-
 po-docs/podfiles    | 32 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
index 0667b784..8c5c9b1e 100644
--- a/po-docs/Makefile.am
+++ b/po-docs/Makefile.am
@@ -41,24 +41,24 @@ EXTRA_DIST = \
 SUBDIRS = $(linguas_translated)
 
 virt-v2v-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 at 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 /virt-v2v-1 | \
-	  grep -v /po-docs/ | \
+	cd $(top_srcdir) && find . -name '*.pod' -printf '%P\n'| \
+	  grep -v ^debian/ | \
+	  grep -v ^virt-v2v-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
 	LC_ALL=C sort -o $@-t $@-t
 	mv $@-t $@
diff --git a/po-docs/language.mk b/po-docs/language.mk
index 54f621b5..05c63d8c 100644
--- a/po-docs/language.mk
+++ b/po-docs/language.mk
@@ -65,7 +65,7 @@ virt-v2v.1: key-option.pod keys-from-stdin-option.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 a1063091..e0a776a5 100644
--- a/po-docs/podfiles
+++ b/po-docs/podfiles
@@ -1,16 +1,16 @@
-../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
-../docs/virt-v2v-copy-to-local.pod
-../docs/virt-v2v-hacking.pod
-../docs/virt-v2v-input-vmware.pod
-../docs/virt-v2v-input-xen.pod
-../docs/virt-v2v-output-local.pod
-../docs/virt-v2v-output-openstack.pod
-../docs/virt-v2v-output-rhv.pod
-../docs/virt-v2v-release-notes-1.42.pod
-../docs/virt-v2v-support.pod
-../docs/virt-v2v.pod
-../test-harness/virt-v2v-test-harness.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
+docs/virt-v2v-copy-to-local.pod
+docs/virt-v2v-hacking.pod
+docs/virt-v2v-input-vmware.pod
+docs/virt-v2v-input-xen.pod
+docs/virt-v2v-output-local.pod
+docs/virt-v2v-output-openstack.pod
+docs/virt-v2v-output-rhv.pod
+docs/virt-v2v-release-notes-1.42.pod
+docs/virt-v2v-support.pod
+docs/virt-v2v.pod
+test-harness/virt-v2v-test-harness.pod
-- 
2.26.2