Fixed absolute paths that were used for the PDF logo.

pgbackrest · May 26, 2016 · cf344c1 · cf344c1
1 parent b19143b
commit cf344c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/doc/lib/BackRestDoc/Common/DocManifest.pm b/doc/lib/BackRestDoc/Common/DocManifest.pm
@@ -181,11 +181,12 @@ sub new
         ${$self->{oManifest}}{render}{$strType} = $oRenderHash;
     }
 
+    # Set the doc path variable
+    $self->variableSet('doc-path', $self->{strDocPath});
+
     # Read variables from manifest
     $self->variableListParse($self->{oManifestXml}->nodeGet('variable-list', false), $oVariableOverride);
 
-    # use Data::Dumper; confess Dumper($self->{oVariable});
-
     # Return from function and log return values if any
     return logDebugReturn
     (

diff --git a/doc/lib/BackRestDoc/Latex/DocLatex.pm b/doc/lib/BackRestDoc/Latex/DocLatex.pm
@@ -95,7 +95,7 @@ sub process
     my $oRender = $self->{oManifest}->renderGet(RENDER_TYPE_PDF);
 
     # Copy the logo
-    copy('/backrest/doc/resource/latex/cds-logo.eps', "$self->{strLatexPath}/logo.eps")
+    copy("$self->{oManifest}{strDocPath}/resource/latex/cds-logo.eps", "$self->{strLatexPath}/logo.eps")
         or confess &log(ERROR, "unable to copy logo");
 
     my $strLatex = $self->{oManifest}->variableReplace(fileStringRead($self->{strPreambleFile}), 'latex') . "\n";

diff --git a/doc/manifest.xml b/doc/manifest.xml
@@ -13,7 +13,7 @@
         <variable key="project-favicon">favicon.png</variable>
 
         <!-- Logo locations -->
-        <variable key="logo">/backrest/doc/output/latex/logo</variable>
+        <variable key="logo">{[doc-path]}/output/latex/logo</variable>
 
         <!-- HTML variables  -->
         <variable key="html-footer" eval='y'>

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
@@ -109,6 +109,14 @@
 
                         <p>Fixed syntax that was not compatible with Perl 5.2X.</p>
                     </release-item>
+
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-ideator id="vondendriesch.adrian"/>
+                        </release-item-contributor-list>
+
+                        <p>Fixed absolute paths that were used for the PDF logo.</p>
+                    </release-item>
                 </release-bug-list>
 
                  <release-feature-list>