texi files with AVOptions documentation are generated in
$(build dir)/doc, so include it to the @include search path for
texi2html and texi2pod.
---
doc/Makefile | 2 +-
doc/texi2pod.pl | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index 5172707..16ad993 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,7 +29,7 @@ $(GENTEXI): doc/avoptions_%.texi: doc/print_options
doc/%.html: TAG = HTML
doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
$(Q)$(TEXIDEP)
- $(M)texi2html -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output
$@ $<
+ $(M)texi2html -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output
$@ -I ./doc/ $<
doc/%.pod: TAG = POD
doc/%.pod: doc/%.texi $(GENTEXI)
diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index 0eb5e8d..81c9d1a 100755
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -37,6 +37,7 @@ $shift = "";
$fnno = 1;
$inf = "";
$ibase = "";
+$obase = "";
while ($_ = shift) {
if (/^-D(.*)$/) {
@@ -71,6 +72,7 @@ if (defined $in) {
if (defined $out) {
open(STDOUT, ">$out") or die "opening \"$out\": $!\n";
+ $obase = $1 if $out =~ m|^(.+)/[^/]+$|;
}
while(defined $inf) {
@@ -107,7 +109,8 @@ while(<$inf>) {
# Try cwd and $ibase.
open($inf, "<" . $1)
or open($inf, "<" . $ibase . "/" . $1)
- or die "cannot open $1 or $ibase/$1: $!\n";
+ or open($inf, "<" . $obase . "/" . $1)
+ or die "cannot open $1 or $ibase/$1 or $obase/$1: $!\n";
next;
};
--
1.7.9.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
