Mercurial > hg > octave-nkf > gnulib-hg
changeset 7215:3869ca15e2bb
Reorder some statements.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 28 Aug 2006 15:21:25 +0000 |
parents | eb43edab28c3 |
children | 91df49e70c77 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-08-27 Bruno Haible <bruno@clisp.org> + + * gnulib-tool: Reorder some statements. + 2006-08-27 Bruno Haible <bruno@clisp.org> * gnulib-tool (func_get_tests_module): Don't assume that $gnulib_dir
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-08-28 15:20:22 $' +cvsdatestamp='$Date: 2006-08-28 15:21:25 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -346,6 +346,7 @@ # Removes the OPTIONS from the arguments. Sets the variables: # - mode list or import or create-testdir or create-megatestdir # - destdir from --dir +# - local_gnulib_dir from --local-dir # - libname, supplied_libname from --lib # - sourcebase from --source-base # - m4base from --m4-base @@ -361,11 +362,11 @@ # - autoconf_minversion minimum supported autoconf version # - do_changelog false if --no-changelog was given, : otherwise # - doit : if actions shall be executed, false if only to be printed -# - local_gnulib_dir from --local-dir # - symbolic true if --symbolic was given, blank otherwise { mode= destdir= + local_gnulib_dir= libname=libgnu supplied_libname= sourcebase= @@ -380,7 +381,6 @@ macro_prefix= do_changelog=: doit=: - local_gnulib_dir= symbolic= supplied_opts="$@" @@ -421,6 +421,16 @@ --dir=* ) destdir=`echo "X$1" | sed -e 's/^X--dir=//'` shift ;; + --local-dir ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --local-dir" + fi + local_gnulib_dir=$1 + shift ;; + --local-dir=* ) + local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` + shift ;; --lib ) shift if test $# = 0; then @@ -521,16 +531,6 @@ --dry-run ) doit=false shift ;; - --local-dir ) - shift - if test $# = 0; then - func_fatal_error "missing argument for --local-dir" - fi - local_gnulib_dir=$1 - shift ;; - --local-dir=* ) - local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` - shift ;; -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) symbolic=true shift ;;