diff --git a/CHANGES b/CHANGES index 4ed1b6ba78..43f70adeed 100644 --- 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 bb536c9596..8c2201f462 100644 --- 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; - } - else { - if (length(rec $2) > 78) { - print rec; - rec = $0; - } + print rec; + if (NF == 1) + rec = $1; else - rec = rec " " $2 + rec = $1 " " $2; + for (i = 3; i <= NF; i++) { + if (length(rec $i) > 76) { + print rec " \\"; + rec = " " $i; + } else { + rec = rec " " $i; + } + } + next; + } + { + for (i = 1; i <= NF; i++) { + if (length(rec $i) > 76) { + print rec, "\\"; + rec = " " $i; + } else { + rec = rec " " $i; + } + } } - } END { print rec }' >> $TMP