diff options
| -rw-r--r-- | align/Makefile.am | 2 | ||||
| -rw-r--r-- | cat/Makefile.am | 6 | ||||
| -rw-r--r-- | clone/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | df/Makefile.am | 2 | ||||
| -rw-r--r-- | edit/Makefile.am | 2 | ||||
| -rw-r--r-- | erlang/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 6 | ||||
| -rw-r--r-- | fish/Makefile.am | 10 | ||||
| -rw-r--r-- | format/Makefile.am | 2 | ||||
| -rw-r--r-- | fuse/Makefile.am | 2 | ||||
| -rw-r--r-- | inspector/Makefile.am | 2 | ||||
| -rw-r--r-- | java/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | ocaml/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | perl/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | po-docs/ja/Makefile.am | 8 | ||||
| -rw-r--r-- | po-docs/uk/Makefile.am | 8 | ||||
| -rw-r--r-- | python/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | rescue/Makefile.am | 2 | ||||
| -rw-r--r-- | resize/Makefile.am | 2 | ||||
| -rw-r--r-- | ruby/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | sparsify/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | test-tool/Makefile.am | 10 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
25 files changed, 48 insertions, 42 deletions
diff --git a/align/Makefile.am b/align/Makefile.am index d1d13255..e74b4dfc 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -60,7 +60,7 @@ noinst_DATA = $(top_builddir)/html/virt-alignment-scan.1.html virt-alignment-scan.1 $(top_builddir)/html/virt-alignment-scan.1.html: stamp-virt-alignment-scan.pod stamp-virt-alignment-scan.pod: virt-alignment-scan.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-alignment-scan.1 \ --html $(top_builddir)/html/virt-alignment-scan.1.html \ $< diff --git a/cat/Makefile.am b/cat/Makefile.am index f883d108..d2660c7a 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -102,7 +102,7 @@ noinst_DATA = \ virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod stamp-virt-cat.pod: virt-cat.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-cat.1 \ --html $(top_builddir)/html/virt-cat.1.html \ $< @@ -111,7 +111,7 @@ stamp-virt-cat.pod: virt-cat.pod virt-ls.1 $(top_builddir)/html/virt-ls.1.html: stamp-virt-ls.pod stamp-virt-ls.pod: virt-ls.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-ls.1 \ --html $(top_builddir)/html/virt-ls.1.html \ $< @@ -120,7 +120,7 @@ stamp-virt-ls.pod: virt-ls.pod virt-filesystems.1 $(top_builddir)/html/virt-filesystems.1.html: stamp-virt-filesystems.pod stamp-virt-filesystems.pod: virt-filesystems.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-filesystems.1 \ --html $(top_builddir)/html/virt-filesystems.1.html \ $< diff --git a/clone/Makefile.am b/clone/Makefile.am index 18e38008..16bff3fa 100644 --- a/clone/Makefile.am +++ b/clone/Makefile.am @@ -35,7 +35,7 @@ noinst_DATA = $(top_builddir)/html/virt-sysprep.1.html virt-sysprep.1 $(top_builddir)/html/virt-sysprep.1.html: stamp-virt-sysprep.pod stamp-virt-sysprep.pod: virt-sysprep.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-sysprep.1 \ --html $(top_builddir)/html/virt-sysprep.1.html \ $< diff --git a/configure.ac b/configure.ac index 07b718ca..2b8a9811 100644 --- a/configure.ac +++ b/configure.ac @@ -458,6 +458,10 @@ else fi AC_SUBST([POD2_UTF8_OPTION]) +dnl Define the path to the podwrapper program. +PODWRAPPER="$(pwd)/podwrapper.sh" +AC_SUBST([PODWRAPPER]) + dnl Check for genisoimage/mkisofs AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) diff --git a/df/Makefile.am b/df/Makefile.am index 83409da1..fc08ee8c 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -66,7 +66,7 @@ noinst_DATA = $(top_builddir)/html/virt-df.1.html virt-df.1 $(top_builddir)/html/virt-df.1.html: stamp-virt-df.pod stamp-virt-df.pod: virt-df.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-df.1 \ --html $(top_builddir)/html/virt-df.1.html \ $< diff --git a/edit/Makefile.am b/edit/Makefile.am index e89136a8..26876a92 100644 --- a/edit/Makefile.am +++ b/edit/Makefile.am @@ -58,7 +58,7 @@ noinst_DATA = $(top_builddir)/html/virt-edit.1.html virt-edit.1 $(top_builddir)/html/virt-edit.1.html: stamp-virt-edit.pod stamp-virt-edit.pod: virt-edit.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-edit.1 \ --html $(top_builddir)/html/virt-edit.1.html \ $< diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am index 724e7f5a..56f3ae80 100644 --- a/erlang/examples/Makefile.am +++ b/erlang/examples/Makefile.am @@ -29,7 +29,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-erlang.3.html guestfs-erlang.3 $(top_builddir)/html/guestfs-erlang.3.html: stamp-guestfs-erlang.pod stamp-guestfs-erlang.pod: guestfs-erlang.pod create_disk.erl inspect_vm.erl - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-erlang.3 \ --html $(top_builddir)/html/guestfs-erlang.3.html \ diff --git a/examples/Makefile.am b/examples/Makefile.am index cba7b337..f39557a1 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -71,7 +71,7 @@ noinst_DATA = \ guestfs-examples.3 $(top_builddir)/html/guestfs-examples.3.html: stamp-guestfs-examples.pod stamp-guestfs-examples.pod: guestfs-examples.pod create_disk.c inspect_vm.c - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-examples.3 \ --html $(top_builddir)/html/guestfs-examples.3.html \ @@ -83,7 +83,7 @@ stamp-guestfs-examples.pod: guestfs-examples.pod create_disk.c inspect_vm.c guestfs-recipes.1 $(top_builddir)/html/guestfs-recipes.1.html: stamp-guestfs-recipes.pod stamp-guestfs-recipes.pod: guestfs-recipes.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 1 \ --man guestfs-recipes.1 \ --html $(top_builddir)/html/guestfs-recipes.1.html \ @@ -93,7 +93,7 @@ stamp-guestfs-recipes.pod: guestfs-recipes.pod guestfs-testing.1 $(top_builddir)/html/guestfs-testing.1.html: stamp-guestfs-testing.pod stamp-guestfs-testing.pod: guestfs-testing.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 1 \ --man guestfs-testing.1 \ --html $(top_builddir)/html/guestfs-testing.1.html \ diff --git a/fish/Makefile.am b/fish/Makefile.am index 23dafd3a..a69dc4d1 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -173,7 +173,7 @@ noinst_DATA = \ guestfish.1 $(top_builddir)/html/guestfish.1.html: stamp-guestfish.pod stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man guestfish.1 \ --html $(top_builddir)/html/guestfish.1.html \ --insert $(srcdir)/guestfish-actions.pod:@ACTIONS@ \ @@ -184,7 +184,7 @@ stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod virt-copy-in.1 $(top_builddir)/html/virt-copy-in.1.html: stamp-virt-copy-in.pod stamp-virt-copy-in.pod: virt-copy-in.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-copy-in.1 \ --html $(top_builddir)/html/virt-copy-in.1.html \ $< @@ -193,7 +193,7 @@ stamp-virt-copy-in.pod: virt-copy-in.pod virt-copy-out.1 $(top_builddir)/html/virt-copy-out.1.html: stamp-virt-copy-out.pod stamp-virt-copy-out.pod: virt-copy-out.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-copy-out.1 \ --html $(top_builddir)/html/virt-copy-out.1.html \ $< @@ -202,7 +202,7 @@ stamp-virt-copy-out.pod: virt-copy-out.pod virt-tar-in.1 $(top_builddir)/html/virt-tar-in.1.html: stamp-virt-tar-in.pod stamp-virt-tar-in.pod: virt-tar-in.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-tar-in.1 \ --html $(top_builddir)/html/virt-tar-in.1.html \ $< @@ -211,7 +211,7 @@ stamp-virt-tar-in.pod: virt-tar-in.pod virt-tar-out.1 $(top_builddir)/html/virt-tar-out.1.html: stamp-virt-tar-out.pod stamp-virt-tar-out.pod: virt-tar-out.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-tar-out.1 \ --html $(top_builddir)/html/virt-tar-out.1.html \ $< diff --git a/format/Makefile.am b/format/Makefile.am index d9ae7e29..5d1dfb00 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -59,7 +59,7 @@ noinst_DATA = $(top_builddir)/html/virt-format.1.html virt-format.1 $(top_builddir)/html/virt-format.1.html: stamp-virt-format.pod stamp-virt-format.pod: virt-format.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-format.1 \ --html $(top_builddir)/html/virt-format.1.html \ $< diff --git a/fuse/Makefile.am b/fuse/Makefile.am index c0e173ef..32df4e8a 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -66,7 +66,7 @@ noinst_DATA = $(top_builddir)/html/guestmount.1.html guestmount.1 $(top_builddir)/html/guestmount.1.html: stamp-guestmount.pod stamp-guestmount.pod: guestmount.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man guestmount.1 \ --html $(top_builddir)/html/guestmount.1.html \ $< diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 00300a09..20d64094 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -84,7 +84,7 @@ noinst_DATA = $(top_builddir)/html/virt-inspector.1.html virt-inspector.1 $(top_builddir)/html/virt-inspector.1.html: stamp-virt-inspector.pod stamp-virt-inspector.pod: virt-inspector.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-inspector.1 \ --html $(top_builddir)/html/virt-inspector.1.html \ $< diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am index 80c2cb3a..15d20d82 100644 --- a/java/examples/Makefile.am +++ b/java/examples/Makefile.am @@ -31,7 +31,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-java.3.html guestfs-java.3 $(top_builddir)/html/guestfs-java.3.html: stamp-guestfs-java.pod stamp-guestfs-java.pod: guestfs-java.pod CreateDisk.java InspectVM.java - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-java.3 \ --html $(top_builddir)/html/guestfs-java.3.html \ diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index da9b8c07..e435d04d 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -31,7 +31,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-ocaml.3.html guestfs-ocaml.3 $(top_builddir)/html/guestfs-ocaml.3.html: stamp-guestfs-ocaml.pod stamp-guestfs-ocaml.pod: guestfs-ocaml.pod create_disk.ml inspect_vm.ml - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-ocaml.3 \ --html $(top_builddir)/html/guestfs-ocaml.3.html \ diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am index 472f0b01..fb52eca3 100644 --- a/perl/examples/Makefile.am +++ b/perl/examples/Makefile.am @@ -29,7 +29,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-perl.3.html guestfs-perl.3 $(top_builddir)/html/guestfs-perl.3.html: stamp-guestfs-perl.pod stamp-guestfs-perl.pod: guestfs-perl.pod create_disk.pl inspect_vm.pl - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-perl.3 \ --html $(top_builddir)/html/guestfs-perl.3.html \ diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am index 8fc48a11..2e99b022 100644 --- a/po-docs/ja/Makefile.am +++ b/po-docs/ja/Makefile.am @@ -57,7 +57,7 @@ EXTRA_DIST = \ all-local: $(MANPAGES) guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-structs.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man $@ \ --insert $(srcdir)/guestfs-actions.pod:@ACTIONS@ \ @@ -66,17 +66,17 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru $< guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man $@ \ --insert $(srcdir)/guestfish-actions.pod:@ACTIONS@ \ --insert $(srcdir)/guestfish-commands.pod:@FISH_COMMANDS@ \ $< %.1: %.pod - $(top_builddir)/podwrapper.sh --man $@ $< + $(PODWRAPPER) --man $@ $< %.1: %.pl - $(top_builddir)/podwrapper.sh --man $@ $< + $(PODWRAPPER) --man $@ $< # Ensure that the first time we build from git, since guestfs.pod # hasn't been built yet, build it. diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am index 8fc48a11..2e99b022 100644 --- a/po-docs/uk/Makefile.am +++ b/po-docs/uk/Makefile.am @@ -57,7 +57,7 @@ EXTRA_DIST = \ all-local: $(MANPAGES) guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-structs.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man $@ \ --insert $(srcdir)/guestfs-actions.pod:@ACTIONS@ \ @@ -66,17 +66,17 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru $< guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man $@ \ --insert $(srcdir)/guestfish-actions.pod:@ACTIONS@ \ --insert $(srcdir)/guestfish-commands.pod:@FISH_COMMANDS@ \ $< %.1: %.pod - $(top_builddir)/podwrapper.sh --man $@ $< + $(PODWRAPPER) --man $@ $< %.1: %.pl - $(top_builddir)/podwrapper.sh --man $@ $< + $(PODWRAPPER) --man $@ $< # Ensure that the first time we build from git, since guestfs.pod # hasn't been built yet, build it. diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am index efd634c5..199ee1e9 100644 --- a/python/examples/Makefile.am +++ b/python/examples/Makefile.am @@ -29,7 +29,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-python.3.html guestfs-python.3 $(top_builddir)/html/guestfs-python.3.html: stamp-guestfs-python.pod stamp-guestfs-python.pod: guestfs-python.pod create_disk.py inspect_vm.py - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-python.3 \ --html $(top_builddir)/html/guestfs-python.3.html \ diff --git a/rescue/Makefile.am b/rescue/Makefile.am index 83c870f6..328df7e6 100644 --- a/rescue/Makefile.am +++ b/rescue/Makefile.am @@ -57,7 +57,7 @@ noinst_DATA = $(top_builddir)/html/virt-rescue.1.html virt-rescue.1 $(top_builddir)/html/virt-rescue.1.html: stamp-virt-rescue.pod stamp-virt-rescue.pod: virt-rescue.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-rescue.1 \ --html $(top_builddir)/html/virt-rescue.1.html \ $< diff --git a/resize/Makefile.am b/resize/Makefile.am index 1157eaa1..00ac1949 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -87,7 +87,7 @@ noinst_DATA = $(top_builddir)/html/virt-resize.1.html virt-resize.1 $(top_builddir)/html/virt-resize.1.html: stamp-virt-resize.pod stamp-virt-resize.pod: virt-resize.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-resize.1 \ --html $(top_builddir)/html/virt-resize.1.html \ $< diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am index 1e0e5a42..75fdfd21 100644 --- a/ruby/examples/Makefile.am +++ b/ruby/examples/Makefile.am @@ -29,7 +29,7 @@ noinst_DATA = $(top_builddir)/html/guestfs-ruby.3.html guestfs-ruby.3 $(top_builddir)/html/guestfs-ruby.3.html: stamp-guestfs-ruby.pod stamp-guestfs-ruby.pod: guestfs-ruby.pod create_disk.rb inspect_vm.rb - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs-ruby.3 \ --html $(top_builddir)/html/guestfs-ruby.3.html \ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index b7d72cfd..02eb433d 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -86,7 +86,7 @@ noinst_DATA = $(top_builddir)/html/virt-sparsify.1.html virt-sparsify.1 $(top_builddir)/html/virt-sparsify.1.html: stamp-virt-sparsify.pod stamp-virt-sparsify.pod: virt-sparsify.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man virt-sparsify.1 \ --html $(top_builddir)/html/virt-sparsify.1.html \ $< diff --git a/src/Makefile.am b/src/Makefile.am index 9ab0e67c..646fae6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -200,7 +200,7 @@ stamp-guestfs.pod: guestfs.pod \ guestfs-actions.pod \ guestfs-availability.pod \ guestfs-structs.pod - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --section 3 \ --man guestfs.3 \ --html $(top_builddir)/html/guestfs.3.html \ diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index d20dfc7a..82ba6ccf 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = libguestfs-test-tool.pod -CLEANFILES = +CLEANFILES = libguestfs-test-tool.1 stamp-libguestfs-test-tool.pod bin_PROGRAMS = libguestfs-test-tool man_MANS = libguestfs-test-tool.1 @@ -33,7 +33,9 @@ libguestfs_test_tool_CFLAGS = \ libguestfs_test_tool_LDADD = \ $(top_builddir)/src/libguestfs.la -libguestfs-test-tool.1: libguestfs-test-tool.pod - $(top_builddir)/podwrapper.sh \ - --man $@ \ +libguestfs-test-tool.1 $(top_builddir)/html/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod + +stamp-libguestfs-test-tool.pod: libguestfs-test-tool.pod + $(PODWRAPPER) \ + --man libguestfs-test-tool.1 \ $< diff --git a/tools/Makefile.am b/tools/Makefile.am index 0a7cfaad..4eaa812e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -44,12 +44,12 @@ man_MANS = virt-tar.1 $(patsubst %,virt-%.1,$(filter-out tar,$(tools))) noinst_DATA = $(tools:%=$(top_builddir)/html/virt-%.1.html) virt-%.1: virt-% - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --man $@ \ $< $(top_builddir)/html/virt-%.1.html: virt-% - $(top_builddir)/podwrapper.sh \ + $(PODWRAPPER) \ --html $@ \ $< |