[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnulib-tool: robustness fix
From: |
Bruno Haible |
Subject: |
gnulib-tool: robustness fix |
Date: |
Mon, 29 Aug 2005 21:58:16 +0200 |
User-agent: |
KMail/1.5 |
I applied this:
* gnulib-tool: Enclose all occurrences of $destdir in "...", so
that it works when the directory contains spaces.
*** gnulib-tool.bak 2005-08-25 14:36:00.000000000 +0200
--- gnulib-tool 2005-08-29 00:10:56.000000000 +0200
***************
*** 789,795 ****
if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
perl -pi -e 's/GNU General/GNU Lesser General/g;' \
-e 's/version 2([ ,])/version 2.1\1/g' \
! $destdir/$g
fi
done
--- 789,795 ----
if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
perl -pi -e 's/GNU General/GNU Lesser General/g;' \
-e 's/version 2([ ,])/version 2.1\1/g' \
! "$destdir/$g"
fi
done
***************
*** 808,825 ****
# Create lib/Makefile.am.
echo "Creating $destdir/$sourcebase/Makefile.am..."
if test -z "$dry_run"; then
! func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am.new
else
func_emit_lib_Makefile_am
fi
! func_mv_if_changed $destdir/$sourcebase/Makefile.am.new \
! $destdir/$sourcebase/Makefile.am
# Create gnulib.m4.
echo "Creating $destdir/$m4base/gnulib.m4..."
(
if test -z "$dry_run"; then
! exec > $destdir/$m4base/gnulib.m4.new
else
echo "# $destdir/$m4base/gnulib.m4"
fi
--- 808,825 ----
# Create lib/Makefile.am.
echo "Creating $destdir/$sourcebase/Makefile.am..."
if test -z "$dry_run"; then
! func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.new
else
func_emit_lib_Makefile_am
fi
! func_mv_if_changed "$destdir"/$sourcebase/Makefile.am.new \
! "$destdir"/$sourcebase/Makefile.am
# Create gnulib.m4.
echo "Creating $destdir/$m4base/gnulib.m4..."
(
if test -z "$dry_run"; then
! exec > "$destdir"/$m4base/gnulib.m4.new
else
echo "# $destdir/$m4base/gnulib.m4"
fi
***************
*** 881,887 ****
echo
echo "# gnulib.m4 ends here"
)
! func_mv_if_changed $destdir/$m4base/gnulib.m4.new $destdir/$m4base/gnulib.m4
echo "Finished."
echo
echo "You may need to add #include directives for the following .h files."
--- 900,906 ----
echo
echo "# gnulib.m4 ends here"
)
! func_mv_if_changed "$destdir"/$m4base/gnulib.m4.new
"$destdir"/$m4base/gnulib.m4
echo "Finished."
echo
echo "You may need to add #include directives for the following .h files."
***************
*** 1160,1167 ****
|| func_fatal_error "destination directory does not exist: $destdir"
# Prefer configure.ac to configure.in
! test -f $destdir/configure.in && configure_ac=$destdir/configure.in
! test -f $destdir/configure.ac && configure_ac=$destdir/configure.ac
test -f "$configure_ac" \
|| func_fatal_error "cannot find $destdir/configure.ac"
--- 1184,1191 ----
|| func_fatal_error "destination directory does not exist: $destdir"
# Prefer configure.ac to configure.in
! test -f "$destdir"/configure.in && configure_ac="$destdir/configure.in"
! test -f "$destdir"/configure.ac && configure_ac="$destdir/configure.ac"
test -f "$configure_ac" \
|| func_fatal_error "cannot find $destdir/configure.ac"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnulib-tool: robustness fix,
Bruno Haible <=