diff --git a/doc/doc.pl b/doc/doc.pl index fe06fcab1..4d40ceb5e 100755 --- a/doc/doc.pl +++ b/doc/doc.pl @@ -19,10 +19,10 @@ use Getopt::Long qw(GetOptions); use Pod::Usage qw(pod2usage); use Storable; -use lib dirname($0) . '/lib'; -use lib dirname(dirname($0)) . '/lib'; -use lib dirname(dirname($0)) . '/build/lib'; -use lib dirname(dirname($0)) . '/test/lib'; +use lib dirname(abs_path($0)) . '/lib'; +use lib dirname(dirname(abs_path($0))) . '/lib'; +use lib dirname(dirname(abs_path($0))) . '/build/lib'; +use lib dirname(dirname(abs_path($0))) . '/test/lib'; use BackRestDoc::Common::Doc; use BackRestDoc::Common::DocConfig; diff --git a/doc/lib/BackRestDoc/Common/Doc.pm b/doc/lib/BackRestDoc/Common/Doc.pm index c92eeca20..a5a18101c 100644 --- a/doc/lib/BackRestDoc/Common/Doc.pm +++ b/doc/lib/BackRestDoc/Common/Doc.pm @@ -8,6 +8,7 @@ use warnings FATAL => qw(all); use Carp qw(confess); use English '-no_match_vars'; +use Cwd qw(abs_path); use File::Basename qw(dirname); use Scalar::Util qw(blessed); use XML::Checker::Parser; @@ -45,7 +46,8 @@ sub new if (defined($self->{strFileName})) { my $oParser = XML::Checker::Parser->new(ErrorContext => 2, Style => 'Tree'); - $oParser->set_sgml_search_path(defined($strSgmlSearchPath) ? $strSgmlSearchPath : dirname(dirname($0)) . '/doc/xml/dtd'); + $oParser->set_sgml_search_path( + defined($strSgmlSearchPath) ? $strSgmlSearchPath : dirname(dirname(abs_path($0))) . '/doc/xml/dtd'); my $oTree; diff --git a/doc/xml/release.xml b/doc/xml/release.xml index ea1c187e9..1abcca1af 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -222,6 +222,10 @@

Add Centos/RHEL 7 option to documentation build.

+ +

Use absolute paths so that ./doc.pl runs.

+
+

Pick pg_switch_wal()/pg_switch_xlog() based on version.