Re: FYI: white space changes in mkinstalldirs and depcomp

[Jim Meyering]

Alexandre Duret-Lutz <address@hidden> wrote:
> The depcomp change is not a problem, but I'd rather not make any
> gratuitous change to mkinstalldirs on the branch.  The reason is
> that both automake and gettextize will install mkinstalldirs in
> a package, and when the installed files are not identical users
> complain about spurious CVS diff each time they reconfigure their
> package (yes, this has happened).
>
> Also you have added your ChangeLog entry in _two_ different places.

Yow!  Sorry about that.  I'll remove the latter and change
the date on the former to be 2003-08-09.

> See
> http://sources.redhat.com/cgi-bin/cvsweb.cgi/automake/ChangeLog.diff?r1=1.2024.2.195&r2=1.2024.2.196&cvsroot=automake
>
>  Jim> # That's a space and a tab in the [].
>  Jim> -      sed -e 's,^.*\.[a-z]*:[  ]*,,' -e 's,$,:,' < "$tmpdepfile" >> 
> "$depfile"
>  Jim> +      sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> 
> "$depfile"
>
> Too bad your whitespace filter doesn't also edit the comments :)

How about this change to repair things?

2003-08-10  Jim Meyering  <address@hidden>

        * lib/depcomp: Adjust comment to match code.
        * lib/mkinstalldirs: Revert yesterday's change; reasons here:
        http://mail.gnu.org/archive/html/automake-patches/2003-08/msg00042.html

Index: lib/depcomp
===================================================================
RCS file: /cvs/automake/automake/lib/depcomp,v
retrieving revision 1.35.2.9
diff -u -p -r1.35.2.9 depcomp
--- lib/depcomp 9 Aug 2003 13:47:51 -0000       1.35.2.9
+++ lib/depcomp 10 Aug 2003 11:17:21 -0000
@@ -285,7 +285,7 @@ tru64)
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
+      # That's a tab and a space in the [].
       sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
Index: lib/mkinstalldirs
===================================================================
RCS file: /cvs/automake/automake/lib/mkinstalldirs,v
retrieving revision 1.10.2.2
diff -u -p -r1.10.2.2 mkinstalldirs
--- lib/mkinstalldirs   9 Aug 2003 13:47:10 -0000       1.10.2.2
+++ lib/mkinstalldirs   10 Aug 2003 11:17:21 -0000
@@ -84,17 +84,17 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-       errstatus=$lasterr
+       errstatus=$lasterr
       else
-       if test ! -z "$dirmode"; then
+       if test ! -z "$dirmode"; then
          echo "chmod $dirmode $pathcomp"
-         lasterr=""
-         chmod "$dirmode" "$pathcomp" || lasterr=$?
+         lasterr=""
+         chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-         if test ! -z "$lasterr"; then
-           errstatus=$lasterr
-         fi
-       fi
+         if test ! -z "$lasterr"; then
+           errstatus=$lasterr
+         fi
+       fi
       fi
     fi