comparison make/solaris/adlc_updater @ 2988:513351373923

Merge
author amurillo
date Sat, 14 Jan 2012 00:47:46 -0800
parents 284d0af00d53
children 0d58ee2030ae
comparison
equal deleted inserted replaced
1:f308cf63738a 2:24b373624327
13 /^#line 999999$/ {print "#line " (NR+1) " \"" F2 "\""; next} 13 /^#line 999999$/ {print "#line " (NR+1) " \"" F2 "\""; next}
14 {print} 14 {print}
15 ' F2=$2 15 ' F2=$2
16 mv $1+ $1 16 mv $1+ $1
17 } 17 }
18 [ -f $3/$1 ] && (fix_lines $2/$1 $3/$1; cmp -s $2/$1 $3/$1) || \ 18 fix_lines $2/$1 $3/$1
19 [ -f $3/$1 ] && cmp -s $2/$1 $3/$1 || \
19 ( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 ) 20 ( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 )