Libguestfs - Sep 2013 - [PATCH] build: fix errors when compiling man-pages

I'm not sure whether this is the best fix, but it makes the build
pass.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

Notes:
    The configure was called like this:
    
    ./autogen.sh --disable-appliance --disable-daemon --with-readline
--disable-php --enable-python --enable-perl --disable-haskell --disable-ruby
--enable-gobject --enable-probes --enable-lua --disable-erlang --without-java
    
    And this is a snip from the failed run of 'make -j5':
    
    make[3]: Entering directory
`/home/nert/dev/work/libguestfs/upstream/po-docs/ja'
    perl /home/nert/dev/work/libguestfs/upstream/podwrapper.pl \
      --no-strict-checks \
      --man virt-list-filesystems.1 \
      virt-list-filesystems.pl
    perl /home/nert/dev/work/libguestfs/upstream/podwrapper.pl \
      --no-strict-checks \
      --man virt-list-partitions.1 \
      virt-list-partitions.pl
    perl /home/nert/dev/work/libguestfs/upstream/podwrapper.pl \
      --no-strict-checks \
      --man virt-make-fs.1 \
      virt-make-fs.pl
    perl /home/nert/dev/work/libguestfs/upstream/podwrapper.pl \
      --no-strict-checks \
      --man virt-tar.1 \
      virt-tar.pl
    perl /home/nert/dev/work/libguestfs/upstream/podwrapper.pl \
      --no-strict-checks \
      --man virt-win-reg.1 \
      virt-win-reg.pl
    podwrapper.pl: virt-list-filesystems.pl: No such file or directory at
/home/nert/dev/work/libguestfs/upstream/podwrapper.pl line 533.
    podwrapper.pl: virt-tar.pl: No such file or directory at
/home/nert/dev/work/libguestfs/upstream/podwrapper.pl line 533.
    make[3]: *** [virt-list-filesystems.1] Error 2
    make[3]: *** Waiting for unfinished jobs....
    make[3]: *** [virt-tar.1] Error 2
    podwrapper.pl: virt-make-fs.pl: No such file or directory at
/home/nert/dev/work/libguestfs/upstream/podwrapper.pl line 533.
    make[3]: *** [virt-make-fs.1] Error 2
    podwrapper.pl: virt-win-reg.pl: No such file or directory at
/home/nert/dev/work/libguestfs/upstream/podwrapper.pl line 533.
    make[3]: *** [virt-win-reg.1] Error 2
    podwrapper.pl: virt-list-partitions.pl: No such file or directory at
/home/nert/dev/work/libguestfs/upstream/podwrapper.pl line 533.
    make[3]: *** [virt-list-partitions.1] Error 2
    make[3]: Leaving directory
`/home/nert/dev/work/libguestfs/upstream/po-docs/ja'
    make[2]: *** [all-recursive] Error 1
    make[2]: Leaving directory
`/home/nert/dev/work/libguestfs/upstream/po-docs'
    make[1]: *** [all-recursive] Error 1
    make[1]: Leaving directory `/home/nert/dev/work/libguestfs/upstream'
    make: *** [all] Error 2

 po-docs/ja/Makefile.am | 8 +++++++-
 po-docs/uk/Makefile.am | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
index 0ec6619..f985adf 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs translations of man pages and POD files
-# Copyright (C) 2010-2012 Red Hat Inc.
+# Copyright (C) 2010-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -136,6 +136,12 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod
sysprep-operations.po
 	  --man $@ \
 	  $<

+%.1: $(top_srcdir)/tools/%
+	$(PODWRAPPER) \
+	  --no-strict-checks \
+	  --man $@ \
+	  $<
+
 # Ensure that the first time we build from git, since guestfs.pod
 # hasn't been built yet, build it.
 $(podfiles): stamp-update-po
diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
index 0ec6619..f985adf 100644
--- a/po-docs/uk/Makefile.am
+++ b/po-docs/uk/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs translations of man pages and POD files
-# Copyright (C) 2010-2012 Red Hat Inc.
+# Copyright (C) 2010-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -136,6 +136,12 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod
sysprep-operations.po
 	  --man $@ \
 	  $<

+%.1: $(top_srcdir)/tools/%
+	$(PODWRAPPER) \
+	  --no-strict-checks \
+	  --man $@ \
+	  $<
+
 # Ensure that the first time we build from git, since guestfs.pod
 # hasn't been built yet, build it.
 $(podfiles): stamp-update-po
-- 
1.8.3.2

On Tue, Sep 24, 2013 at 04:45:30PM +0200, Martin Kletzander
wrote:
> I'm not sure whether this is the best fix, but it makes the build
> pass.
Sorry for the delay.  For some reason I thought I'd applied
this, but actually I'd forgotten about it.

I believe the original motivation for creating the tool.pl -> tool
symlink was because xgettext didn't know these files were Perl and so
used the wrong language filter.  Things have moved on a bit since
then, because we now run xgettext directly instead of using the
sociopathic gettextize utility.

Therefore I pushed the following patch which I believe simplifies
things.

https://github.com/libguestfs/libguestfs/commit/93dbeb6b6c5ac161043d6d9dd7576f85548a055d

(Actually this patch tools ages longer to write than I expected and is
quite complex, but I believe it's still a simplification ...)

Let me know if you've still got problems after this patch.

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

On Thu, Sep 26, 2013 at 10:12:23PM +0100, Richard W.M. Jones
wrote:
> Let me know if you've still got problems after this patch.
BTW you'll (still, same as before) need to do:

  make -C po-docs update-po

There's some circular dependency that makes this necessary which I
don't understand.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/