Merge branch 'ballygarvan' into HEAD

Replacing the old 3.0-alpha0 cork mechanism with another one inside the
routing table. This version should be simpler and also quite clear what
it does, why and when.

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/linuxdoc b/tools/linuxdoc
index 51110e79..58f5cbc4 100755
--- a/tools/linuxdoc
+++ b/tools/linuxdoc
@@ -25,8 +25,13 @@ use FindBin;
 $prefix             = "/usr";
 $isoentities_prefix = "/usr";
 $DataDir            = "$FindBin::Bin/../doc/sbase";
-$AuxBinDir          = "/usr/lib/linuxdoc-tools";
-
+if (-d "/usr/lib/linuxdoc-tools")
+{
+  $AuxBinDir          = "/usr/lib/linuxdoc-tools";
+} else
+{
+  $AuxBinDir          = "/usr/bin";
+}
 use lib "$FindBin::Bin/linuxdoc-tools";
 
 # ---------------------------------------------------------------------