Fix broken merge from 1.9 branch.

diff --git a/ChangeLog b/ChangeLog
index 8cd6bdb239038bfe9f65734accd6c9e8303b5f77..09147ca7064bf71e08144f73d23babe3772a9266 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 20 00:54:54 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Fix broken merge from 1.9 branch.
+
 Sat Jun  1 23:22:19 CDT 2002 Adam Heath <doogie@debian.org>
 
   * dpkg-deb/main.c, main/main.c, main/query.c, dselect/main.cc,

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index f4ad0ceb5d8162fbc348c121ec035a0c75186e84..d5b5a40598737c98713bd7ad4789bf2af1429eae 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -219,11 +219,22 @@ $name: unable to determine description for \`dir' entry - giving up
         }
 
         $align--; $calign--;
+        $lprefix= length($cprefix);
+        if ($lprefix < $align) {
+            $cprefix .= ' ' x ($align - $lprefix);
+            $lprefix= $align;
+        }
+        $prefix= "\n". (' 'x $calign);
         $cwidth= $maxwidth+1;
 
         for $_ (split(/\s+/,$description)) {
             $l= length($_);
             $cwidth++; $cwidth += $l;
+            if ($cwidth > $maxwidth) {
+                $infoentry .= $cprefix;
+                $cwidth= $lprefix+1+$l;
+                $cprefix= $prefix; $lprefix= $calign;
+            }
             $infoentry.= ' '; $infoentry .= $_;
         }