Doc: Allow overriding $SGML_CATALOG_FILES using distribution specific paths

diff --git a/doc/sgml2html b/doc/sgml2html
index a5bbee9eb8abd0c8747808a13f8207665765d33d..6072a7a3677a235bbc4f00ef975edbd6cfeeff1e 100755 (executable)
--- 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 02b60d9439d898ab4e949e617238ca20cfc9df31..c48f787d88227be8443831920ca9f97465849ffa 100755 (executable)
--- 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 dfc017ded1d39ac6681a75da1c1603352ee62279..af0bcb49a57737c939914a35ea9f87b396425d4a 100755 (executable)
--- 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;