diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rwxr-xr-x | gcc/fixproto | 39 |
2 files changed, 28 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5d53ed9..71289d2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-08-11 Laurynas Biveinis <lauras@softhome.net> + + * fixproto: Recognize DOS paths with drive letters as absolute paths. + 2000-08-11 Nathan Sidwell <nathan@codesourcery.com> * extend.texi (Volatiles): Fix typos. diff --git a/gcc/fixproto b/gcc/fixproto index c2c8255..1db488c 100755 --- a/gcc/fixproto +++ b/gcc/fixproto @@ -90,11 +90,14 @@ src_dir_all=$2 # "standard" ANSI/POSIX files listed in $std_files are processed. src_dir_std=$3 -if [ `expr $rel_target_dir : '\(.\)'` != '/' ] ; then - abs_target_dir=$original_dir/$rel_target_dir -else - abs_target_dir=$rel_target_dir -fi +case $rel_target_dir in + /* | [A-Za-z]:[\\/]*) + abs_target_dir=$rel_target_dir + ;; + *) + abs_target_dir=$original_dir/$rel_target_dir + ;; +esac # Determine whether this system has symbolic links. if ln -s X $rel_target_dir/ShouldNotExist 2>/dev/null; then @@ -118,11 +121,14 @@ include_path="" if [ `echo $* | wc -w` != 0 ] ; then for rel_source_dir in $src_dir_all $src_dir_std; do - if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then - abs_source_dir=$original_dir/$rel_source_dir - else - abs_source_dir=$rel_source_dir - fi + case $rel_source_dir in + /* | [A-Za-z]:[\\/]*) + abs_source_dir=$rel_source_dir + ;; + *) + abs_source_dir=$original_dir/$rel_source_dir + ;; + esac include_path="$include_path -I$abs_source_dir" done fi @@ -175,11 +181,14 @@ for code in ALL STD ; do ;; esac - if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then - abs_source_dir=$original_dir/$rel_source_dir - else - abs_source_dir=$rel_source_dir - fi + case $rel_source_dir in + /* | [A-Za-z]:[\\/]*) + abs_source_dir=$rel_source_dir + ;; + *) + abs_source_dir=$original_dir/$rel_source_dir + ;; + esac if [ \! -d $abs_source_dir ] ; then echo $progname\: warning\: no such directory\: \`$rel_source_dir\' |