From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 4 Dec 2018 17:14:04 +0000 (+0100)
Subject: Doc: Allow overriding $SGML_CATALOG_FILES using distribution specific paths
X-Git-Tag: v2.0.3~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4920632aa30dab4fbfb0530bce5a959e7a7675;p=thirdparty%2Fbird.git

Doc: Allow overriding $SGML_CATALOG_FILES using distribution specific paths
---

diff --git a/doc/sgml2html b/doc/sgml2html
index a5bbee9eb..6072a7a36 100755
--- a/doc/sgml2html
+++ b/doc/sgml2html
@@ -34,7 +34,8 @@ $progs = {
   "GROFFMACRO" => "-ms",
   "AWK" => "/usr/share/linuxdoc-tools/awkwhich"
 };
-$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog";
+$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" .
+  (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : "");
 
 require "$FindBin::Bin/LinuxDocTools.pm";
 &LinuxDocTools::init;
diff --git a/doc/sgml2latex b/doc/sgml2latex
index 02b60d943..c48f787d8 100755
--- a/doc/sgml2latex
+++ b/doc/sgml2latex
@@ -34,7 +34,8 @@ $progs = {
   "GROFFMACRO" => "-ms",
   "AWK" => "/usr/share/linuxdoc-tools/awkwhich"
 };
-$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog";
+$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" .
+  (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : "");
 
 require "$FindBin::Bin/LinuxDocTools.pm";
 &LinuxDocTools::init;
diff --git a/doc/sgml2txt b/doc/sgml2txt
index dfc017ded..af0bcb49a 100755
--- a/doc/sgml2txt
+++ b/doc/sgml2txt
@@ -34,7 +34,8 @@ $progs = {
   "GROFFMACRO" => "-ms",
   "AWK" => "/usr/share/linuxdoc-tools/awkwhich"
 };
-$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog";
+$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" .
+  (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : "");
 
 require "$FindBin::Bin/LinuxDocTools.pm";
 &LinuxDocTools::init;