3234. [bug] 'make depend' produced invalid makefiles. [RT #26830]

diff --git a/CHANGES b/CHANGES
index 2f565f8149913012ad1be7bbcf8459d504348672..6f4e265ed52b7ba99d638fd185b8839bd828d1ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3234.  [bug]           'make depend' produced invalid makefiles. [RT #26830]
+
 3231.  [bug]           named could fail to send a uncompressable zone.
                        [RT #26796]
 

diff --git a/make/mkdep.in b/make/mkdep.in
index bb536c95968bbdb75b5862e1a00c223d20752846..8c2201f462c0d290f59efc9620ccf870ab3e4625 100644 (file)
--- a/make/mkdep.in
+++ b/make/mkdep.in
@@ -140,25 +140,37 @@ if [ X"${MKDEPPROG}" != X ]; then
 else
     @MKDEPCC@ @MKDEPCFLAGS@ ${newargs} |
     sed "
-       s; \./; ;g
+       s; \\./; ;g
+       s; \\\\; ;g
        @LIBTOOL_MKDEP_SED@
        $SED" |
-    awk '{
-       if ($1 != prev) {
+    awk '$1 ~ /:$/ {
                if (rec != "")
-                       print rec;
-               rec = $0;
-               prev = $1;
+                        print rec;
+               if (NF == 1)
+                       rec = $1;
+               else
+                       rec = $1 " " $2;
+               for (i = 3; i <= NF; i++) {
+                       if (length(rec $i) > 76) {
+                               print rec " \\";
+                               rec = "    " $i;
+                       } else {
+                               rec = rec " " $i;
+                       }
+               }
+               next;
        }
-       else {
-               if (length(rec $2) > 78) {
-                       print rec;
-                       rec = $0;
+       {
+               for (i = 1; i <= NF; i++) {
+                       if (length(rec $i) > 76) {
+                               print rec, "\\";
+                               rec =  "    " $i;
+                       } else {
+                               rec = rec " " $i;
+                       }
                }
-               else
-                       rec = rec " " $2
        }
-    }
     END {
        print rec
     }' >> $TMP