Strip the trailing '/dir' from '--dir-file' option parameter to make it

GNU install-info compatible (Clint Adams). Closes: #61640, #67237

diff --git a/ChangeLog b/ChangeLog
index 93090edc83dfb16dfebfb7293392f3cf13fe629d..3d621f833c4f79e0c4f154fd2d9fffde54e3d906 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-22  Clint Adams  <schizo@debian.org>
+
+       * scripts/install-info.pl: Strip any trailing '/dir' from the
+       '--dir-file' option parameter, to make it GNU install-info compatible.
+
 2006-04-21  Guillem Jover  <guillem@debian.org>
 
        * src/query.c (enqperpackage): Change dynamically consutructed

diff --git a/debian/changelog b/debian/changelog
index c9ca59edcd753056779e80424e1044654d2094ed..b5c51d715c71bd75fbc9a26d401dd64fc43b3ae8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Fix strings so that they can be more easily translated. Closes: #134358
+  * Strip the trailing '/dir' from '--dir-file' option parameter to make it
+    GNU install-info compatible (Clint Adams). Closes: #61640, #67237
 
  -- Bart Cornelis (cobaco) <cobaco@linux.be>  Thu, 13 Apr 2006 12:51:15 +0200
 

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 3daa033c7f907ec8436c7fc4dce0a78748d065b6..7ad007a41efa6e5bc9003c01589d40353ec8afce 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -92,6 +92,7 @@ while ($ARGV[0] =~ m/^--/) {
         $description=$';
     } elsif (m/^--dir-file=/) { # for compatibility with GNU install-info
        $infodir=$';
+       $infodir=~s/\/dir$//;
     } else {
         print STDERR "$name: unknown option \`$_'\n"; &usage(STDERR); exit 1;
     }