3:58 a.m.
---
cat/Makefile.am | 6 +++---
df/Makefile.am | 2 +-
edit/Makefile.am | 2 +-
examples/Makefile.am | 12 ++++++------
fish/Makefile.am | 18 +++++++++---------
fuse/Makefile.am | 2 +-
inspector/Makefile.am | 2 +-
java/examples/Makefile.am | 6 +++---
ocaml/examples/Makefile.am | 6 +++---
perl/examples/Makefile.am | 6 +++---
po-docs/ja/Makefile.am | 18 +++++++++---------
po-docs/uk/Makefile.am | 18 +++++++++---------
podwrapper.sh.in | 1 +
python/examples/Makefile.am | 6 +++---
rescue/Makefile.am | 2 +-
resize/Makefile.am | 2 +-
ruby/examples/Makefile.am | 6 +++---
src/Makefile.am | 8 ++++----
test-tool/Makefile.am | 4 ++--
tools/Makefile.am | 4 ++--
20 files changed, 66 insertions(+), 65 deletions(-)
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 6022cd6..91abfac 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man virt-filesystems.1 \
--html $(top_builddir)/html/virt-filesystems.1.html \
$<
diff --git a/df/Makefile.am b/df/Makefile.am
index 88e32af..6281c96 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man virt-df.1 \
--html $(top_builddir)/html/virt-df.1.html \
$<
diff --git a/edit/Makefile.am b/edit/Makefile.am
index e33b33c..eac2877 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man virt-edit.1 \
--html $(top_builddir)/html/virt-edit.1.html \
$<
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b8a2ffe..c84285f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -64,20 +64,20 @@ 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_srcdir)/podwrapper.sh \
+stamp-guestfs-examples.pod: $(srcdir)/guestfs-examples.pod $(srcdir)/create_disk.c
$(srcdir)/inspect_vm.c
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-examples.3 \
--html $(top_builddir)/html/guestfs-examples.3.html \
- --verbatim create_disk.c:@EXAMPLE1@ \
- --verbatim inspect_vm.c:@EXAMPLE2@ \
+ --verbatim $(srcdir)/create_disk.c:@EXAMPLE1@ \
+ --verbatim $(srcdir)/inspect_vm.c:@EXAMPLE2@ \
$<
touch $@
guestfs-recipes.1 $(top_builddir)/html/guestfs-recipes.1.html: stamp-guestfs-recipes.pod
-stamp-guestfs-recipes.pod: guestfs-recipes.pod create_disk.c inspect_vm.c
- $(top_srcdir)/podwrapper.sh \
+stamp-guestfs-recipes.pod: $(builddir)/guestfs-recipes.pod create_disk.c inspect_vm.c
+ $(top_builddir)/podwrapper.sh \
--section 1 \
--man guestfs-recipes.1 \
--html $(top_builddir)/html/guestfs-recipes.1.html \
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 22aaf4c..6018868 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -170,7 +170,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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man guestfish.1 \
--html $(top_builddir)/html/guestfish.1.html \
--insert guestfish-actions.pod:@ACTIONS@ \
@@ -180,8 +180,8 @@ 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_srcdir)/podwrapper.sh \
+stamp-virt-copy-in.pod: $(srcdir)/virt-copy-in.pod
+ $(top_builddir)/podwrapper.sh \
--man virt-copy-in.1 \
--html $(top_builddir)/html/virt-copy-in.1.html \
$<
@@ -189,8 +189,8 @@ 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_srcdir)/podwrapper.sh \
+stamp-virt-copy-out.pod: $(srcdir)/virt-copy-out.pod
+ $(top_builddir)/podwrapper.sh \
--man virt-copy-out.1 \
--html $(top_builddir)/html/virt-copy-out.1.html \
$<
@@ -198,8 +198,8 @@ 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_srcdir)/podwrapper.sh \
+stamp-virt-tar-in.pod: $(srcdir)/virt-tar-in.pod
+ $(top_builddir)/podwrapper.sh \
--man virt-tar-in.1 \
--html $(top_builddir)/html/virt-tar-in.1.html \
$<
@@ -207,8 +207,8 @@ 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_srcdir)/podwrapper.sh \
+stamp-virt-tar-out.pod: $(srcdir)/virt-tar-out.pod
+ $(top_builddir)/podwrapper.sh \
--man virt-tar-out.1 \
--html $(top_builddir)/html/virt-tar-out.1.html \
$<
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index b7558ee..10bbc9d 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man guestmount.1 \
--html $(top_builddir)/html/guestmount.1.html \
$<
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 5c48724..03e13d8 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -81,7 +81,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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--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 503b55d..60fd958 100644
--- a/java/examples/Makefile.am
+++ b/java/examples/Makefile.am
@@ -31,12 +31,12 @@ 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-java.3 \
--html $(top_builddir)/html/guestfs-java.3.html \
- --verbatim CreateDisk.java:@EXAMPLE1@ \
- --verbatim InspectVM.java:@EXAMPLE2@ \
+ --verbatim $(srcdir)/CreateDisk.java:@EXAMPLE1@ \
+ --verbatim $(srcdir)/InspectVM.java:@EXAMPLE2@ \
$<
touch $@
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index 61a94af..43e579c 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -31,12 +31,12 @@ 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-ocaml.3 \
--html $(top_builddir)/html/guestfs-ocaml.3.html \
- --verbatim create_disk.ml:@EXAMPLE1@ \
- --verbatim inspect_vm.ml:@EXAMPLE2@ \
+ --verbatim $(srcdir)/create_disk.ml:@EXAMPLE1@ \
+ --verbatim $(srcdir)/inspect_vm.ml:@EXAMPLE2@ \
$<
touch $@
diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am
index 354531a..387cdf1 100644
--- a/perl/examples/Makefile.am
+++ b/perl/examples/Makefile.am
@@ -29,11 +29,11 @@ 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-perl.3 \
--html $(top_builddir)/html/guestfs-perl.3.html \
- --verbatim create_disk.pl:@EXAMPLE1@ \
- --verbatim inspect_vm.pl:@EXAMPLE2@ \
+ --verbatim $(srcdir)/create_disk.pl:@EXAMPLE1@ \
+ --verbatim $(srcdir)/inspect_vm.pl:@EXAMPLE2@ \
$<
touch $@
diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
index 4b149fe..07778b5 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -52,26 +52,26 @@ EXTRA_DIST = \
all-local: $(MANPAGES)
guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-structs.pod
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man $@ \
- --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
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man $@ \
- --insert guestfish-actions.pod:@ACTIONS@ \
- --insert guestfish-commands.pod:@FISH_COMMANDS@ \
+ --insert $(srcdir)/guestfish-actions.pod:@ACTIONS@ \
+ --insert $(srcdir)/guestfish-commands.pod:@FISH_COMMANDS@ \
$<
%.1: %.pod
- $(top_srcdir)/podwrapper.sh --man $@ $<
+ $(top_builddir)/podwrapper.sh --man $@ $<
%.1: %.pl
- $(top_srcdir)/podwrapper.sh --man $@ $<
+ $(top_builddir)/podwrapper.sh --man $@ $<
# XXX Can automake do this properly?
install-data-hook:
diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
index 4b149fe..07778b5 100644
--- a/po-docs/uk/Makefile.am
+++ b/po-docs/uk/Makefile.am
@@ -52,26 +52,26 @@ EXTRA_DIST = \
all-local: $(MANPAGES)
guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-structs.pod
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man $@ \
- --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
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man $@ \
- --insert guestfish-actions.pod:@ACTIONS@ \
- --insert guestfish-commands.pod:@FISH_COMMANDS@ \
+ --insert $(srcdir)/guestfish-actions.pod:@ACTIONS@ \
+ --insert $(srcdir)/guestfish-commands.pod:@FISH_COMMANDS@ \
$<
%.1: %.pod
- $(top_srcdir)/podwrapper.sh --man $@ $<
+ $(top_builddir)/podwrapper.sh --man $@ $<
%.1: %.pl
- $(top_srcdir)/podwrapper.sh --man $@ $<
+ $(top_builddir)/podwrapper.sh --man $@ $<
# XXX Can automake do this properly?
install-data-hook:
diff --git a/podwrapper.sh.in b/podwrapper.sh.in
index c883c6a..9accaf9 100755
--- a/podwrapper.sh.in
+++ b/podwrapper.sh.in
@@ -180,6 +180,7 @@ if [ -n "$text_output" ]; then
fi
if [ -n "$html_output" ]; then
+ mkdir -p "$abs_top_builddir/html"
"$POD2HTML" \
--css "pod.css" --htmldir "$abs_top_builddir/html" \
< $tmpdir/full.pod > "$html_output".tmp
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
index 208fecd..434c8f7 100644
--- a/python/examples/Makefile.am
+++ b/python/examples/Makefile.am
@@ -29,11 +29,11 @@ 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-python.3 \
--html $(top_builddir)/html/guestfs-python.3.html \
- --verbatim create_disk.py:@EXAMPLE1@ \
- --verbatim inspect_vm.py:@EXAMPLE2@ \
+ --verbatim $(srcdir)/create_disk.py:@EXAMPLE1@ \
+ --verbatim $(srcdir)/inspect_vm.py:@EXAMPLE2@ \
$<
touch $@
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index d3783ae..85a70f9 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man virt-rescue.1 \
--html $(top_builddir)/html/virt-rescue.1.html \
$<
diff --git a/resize/Makefile.am b/resize/Makefile.am
index fd7f71a..93a2600 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -68,7 +68,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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--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 6e94acf..7183e80 100644
--- a/ruby/examples/Makefile.am
+++ b/ruby/examples/Makefile.am
@@ -29,11 +29,11 @@ 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs-ruby.3 \
--html $(top_builddir)/html/guestfs-ruby.3.html \
- --verbatim create_disk.rb:@EXAMPLE1@ \
- --verbatim inspect_vm.rb:@EXAMPLE2@ \
+ --verbatim $(srcdir)/create_disk.rb:@EXAMPLE1@ \
+ --verbatim $(srcdir)/inspect_vm.rb:@EXAMPLE2@ \
$<
touch $@
diff --git a/src/Makefile.am b/src/Makefile.am
index fa088fe..0666f9f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,12 +192,12 @@ stamp-guestfs.pod: guestfs.pod \
guestfs-actions.pod \
guestfs-availability.pod \
guestfs-structs.pod
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--section 3 \
--man guestfs.3 \
--html $(top_builddir)/html/guestfs.3.html \
- --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@ \
$<
touch $@
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index 9fa4033..af1bffb 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -33,7 +33,7 @@ libguestfs_test_tool_CFLAGS = \
libguestfs_test_tool_LDADD = \
$(top_builddir)/src/libguestfs.la
-libguestfs-test-tool.1: libguestfs-test-tool.pod
- $(top_srcdir)/podwrapper.sh \
+libguestfs-test-tool.1: $(builddir)/libguestfs-test-tool.pod
+ $(top_builddir)/podwrapper.sh \
--man $@ \
$<
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6059d35..5586bf8 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_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--man $@ \
$<
$(top_builddir)/html/virt-%.1.html: virt-%
- $(top_srcdir)/podwrapper.sh \
+ $(top_builddir)/podwrapper.sh \
--html $@ \
$<
--
1.7.5.4