mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Andrews
2011-12-02 07:03:27 +00:00
parent 37d71e4493
commit b68dc65959
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
3234. [bug] 'make depend' produced invalid makefiles. [RT #26830]
3233. [bug] 'rndc freeze/thaw' didn't work for inline zones. 3233. [bug] 'rndc freeze/thaw' didn't work for inline zones.
[RT #26632] [RT #26632]

40
make/mkdep.in
View File

@@ -140,25 +140,37 @@ if [ X"${MKDEPPROG}" != X ]; then
else else
@MKDEPCC@ @MKDEPCFLAGS@ ${newargs} | @MKDEPCC@ @MKDEPCFLAGS@ ${newargs} |
sed " sed "
s; \./; ;g s; \\./; ;g
s; \\\\; ;g
@LIBTOOL_MKDEP_SED@ @LIBTOOL_MKDEP_SED@
$SED" | $SED" |
awk '{ awk '$1 ~ /:$/ {
if ($1 != prev) {
if (rec != "") if (rec != "")
print rec; print rec;
rec = $0; if (NF == 1)
prev = $1; rec = $1;
}
else {
if (length(rec $2) > 78) {
print rec;
rec = $0;
}
else 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 { END {
print rec print rec
}' >> $TMP }' >> $TMP