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

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

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

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
 

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;
     }