automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: white space changes in mkinstalldirs and depcomp


From: Jim Meyering
Subject: FYI: white space changes in mkinstalldirs and depcomp
Date: Sat, 09 Aug 2003 15:52:21 +0200

I've just checked in the following changes on the 1.7 branch
(thinking it was the trunk -- hope that's ok).
I'll put them on the trunk shortly.

The mkinstalldirs changes affect leading white space only.
The depcomp change does this (filtered through `cat -A'):

- sed -e 's,^.*\.[a-z]*:[ ^I]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"$
+ sed -e 's,^.*\.[a-z]*:[^I ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"$

2003-04-21  Jim Meyering  <address@hidden>

        * lib/mkinstalldirs: Remove each sequence of spaces before a
        TAB character.
        * lib/depcomp: Search for TAB-SPC, not SPC-TAB.


Index: lib/depcomp
===================================================================
RCS file: /cvs/automake/automake/lib/depcomp,v
retrieving revision 1.35.2.8
retrieving revision 1.35.2.9
diff -u -p -u -r1.35.2.8 -r1.35.2.9
--- lib/depcomp 31 Jul 2003 21:18:37 -0000      1.35.2.8
+++ lib/depcomp 9 Aug 2003 13:47:51 -0000       1.35.2.9
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ tru64)
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[  ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi

Index: lib/mkinstalldirs
===================================================================
RCS file: /cvs/automake/automake/lib/mkinstalldirs,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -p -u -r1.10.2.1 -r1.10.2.2
--- lib/mkinstalldirs   27 Sep 2002 19:59:46 -0000      1.10.2.1
+++ lib/mkinstalldirs   9 Aug 2003 13:47:10 -0000       1.10.2.2
@@ -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
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]