diff --git a/m4/guestfs_perl.m4 b/m4/guestfs_perl.m4 index 249772c90..be688b4b4 100644 --- a/m4/guestfs_perl.m4 +++ b/m4/guestfs_perl.m4 @@ -35,7 +35,7 @@ else fi dnl Define the path to the podwrapper program. -PODWRAPPER="$PERL $(pwd)/podwrapper.pl" +PODWRAPPER="\$(guestfs_am_v_podwrapper)$PERL $(pwd)/podwrapper.pl" AC_SUBST([PODWRAPPER]) dnl Check for Perl for Perl bindings and Perl tools. diff --git a/podwrapper.pl.in b/podwrapper.pl.in index 7322a3029..e9cafed3f 100755 --- a/podwrapper.pl.in +++ b/podwrapper.pl.in @@ -520,7 +520,7 @@ if ($man) { unlink $man; die "$input: errors or warnings in this POD file, see messages above\n" } - print "$progname: wrote $man\n"; + #print "$progname: wrote $man\n"; } # Output HTML. @@ -618,7 +618,7 @@ if ($html) { unlink $html; die "$input: errors or warnings in this POD file, see messages above\n" } - print "$progname: wrote $html\n"; + #print "$progname: wrote $html\n"; } # Output text. @@ -637,7 +637,7 @@ if ($text) { unlink $text; die "$input: errors or warnings in this POD file, see messages above\n" } - print "$progname: wrote $text\n"; + #print "$progname: wrote $text\n"; } sub read_whole_file diff --git a/subdir-rules.mk b/subdir-rules.mk index d6aaba7b6..243293962 100644 --- a/subdir-rules.mk +++ b/subdir-rules.mk @@ -69,6 +69,9 @@ guestfs_am_v_javac_0 = @echo " JAVAC " $@; guestfs_am_v_erlc = $(guestfs_am_v_erlc_@AM_V@) guestfs_am_v_erlc_ = $(guestfs_am_v_erlc_@AM_DEFAULT_V@) guestfs_am_v_erlc_0 = @echo " ERLC " $@; +guestfs_am_v_podwrapper = $(guestfs_am_v_podwrapper_@AM_V@) +guestfs_am_v_podwrapper_ = $(guestfs_am_v_podwrapper_@AM_DEFAULT_V@) +guestfs_am_v_podwrapper_0 = @echo " POD " $@; .mli.cmi: $(guestfs_am_v_ocamlc)$(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@