Mercurial > hg > octave-lyh > gnulib-hg
changeset 6199:b71216f1bb18
Don't put symlinks unless asked for.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 02 Sep 2005 11:18:48 +0000 |
| parents | 4270667abdee |
| children | dae7c9179bef |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-09-01 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): Fix handling of symbolic links. + 2005-09-01 Bruno Haible <bruno@clisp.org> * gnulib-tool (import): In the first-use case, provide defaults.
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-09-01 12:28:32 $' +cvsdatestamp='$Date: 2005-09-02 11:18:48 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -976,7 +976,7 @@ fi test -n "$dry_run" && dry=echo $dry mv -f "$destdir/$g2" "$destdir/${g2}~" || func_fatal_error "failed" - if test -z "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then + if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp" > /dev/null; then func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2" else $dry mv -f "$destdir/$g2.tmp" "$destdir/${g2}" || func_fatal_error "failed"