X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=util%2Fdist-wget;h=2dc305ccda129ae45cb5a38c99e56fd63bcdf5ee;hb=4055ebc41f1c10a0d5c2d3643c1f10271d983c67;hp=b55d04a80dcf26ac9026d03483d47a29e2e31b54;hpb=529bb05bc6e6aa84cd2da92d2dc7f0cd970cf5fc;p=wget

diff --git a/util/dist-wget b/util/dist-wget
index b55d04a8..2dc305cc 100755
--- a/util/dist-wget
+++ b/util/dist-wget
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 # Copyright (C) 2001 Free Software Foundation, Inc.
 
@@ -26,13 +26,15 @@
 # file, but you are not obligated to do so.  If you do not wish to do
 # so, delete this exception statement from your version.
 
+set -e
 
 CVSROOT=:pserver:cvs@sunsite.dk:/pack/anoncvs
 SUBDIR=wget.cvs.$$
 DEBUG=no
 
-EXPORT_TAG='-D now'
+EXPORT_TAG='-r HEAD'
 VERSION=
+MAKE=${MAKE-make}
 
 if test x"$TMPDIR" = x
 then
@@ -52,7 +54,7 @@ do
       ;;
     -r)
       shift
-      EXPORT_TAG="-r $1"
+      EXPORT_TAG="-r '$1'"
       ;;
     --force-version)
       shift
@@ -68,7 +70,7 @@ done
 # Resolve echo -n incompatibilities.
 e_n=-n
 e_c=
-if test "`(echo foo; echo -n bar) | tr '[\012]' x`" != fooxbar; then
+if test x"`(echo -n foo; echo bar)`" != xfoobar; then
   e_n=
   e_c='\c'
 fi
@@ -84,7 +86,7 @@ echo "Output from commands is in $O."
 echo "-----------" >$O
 
 # Checkout clean sources from the repository.
-echo $e_n "Exporting ($EXPORT_TAG) out the CVS tree to $SUBDIR... $e_c"
+echo $e_n "Exporting ($EXPORT_TAG) out the CVS tree to $TMPDIR/$SUBDIR... $e_c"
 cvs -d $CVSROOT export $EXPORT_TAG -d $SUBDIR wget 1>>$O 2>&1
 echo "done."
 
@@ -96,21 +98,22 @@ rm -rf Branches 1>>$O 2>&1
 # Force the version if required.
 if test x"$VERSION" != x
 then
-  echo "char *version_string = \"$VERSION\";" > src/version.c
   echo "Forcing version to $VERSION."
+  echo "char *version_string = \"$VERSION\";" > src/version.c
+  echo "@set VERSION $VERSION" > doc/version.texi
 fi
 
 # Create configure and friends.
-if ! test -f configure; then
+if test ! -f configure; then
   echo $e_n "Creating \`configure' from \`configure.in'... $e_c"
-  make -f Makefile.cvs 1>>$O 2>&1
+  $MAKE -f Makefile.cvs 1>>$O 2>&1
   echo "done."
 fi
 
 # Remove `Makefile' if it already exists.
 if test -f Makefile; then
-  echo $e_n "Cleaning old Makefiles with \`make distclean'... $e_c"
-  make distclean 1>>$O 2>&1
+  echo $e_n "Cleaning old Makefiles with \`$MAKE distclean'... $e_c"
+  $MAKE distclean 1>>$O 2>&1
   echo "done."
 fi
 
@@ -122,22 +125,23 @@ echo "done."
 # Now build the MO files.
 echo $e_n "Building MO files out of PO files... $e_c"
 cd po
-make 1>>$O 2>&1
+$MAKE 1>>$O 2>&1
 cd ..
 echo "done."
 
 # Now build the Info documentation and the man page.
 echo $e_n "Building Info and man documentation... $e_c"
 cd doc
-make 1>>$O 2>&1
+$MAKE 1>>$O 2>&1
 cd ..
 echo "done."
 
 # Create the distribution file.
 echo $e_n "Creating distribution tarball... $e_c"
-make dist 1>>$O 2>&1
-mv wget-*.tar.gz $DEST_DIR
-echo "done."
+$MAKE dist 1>>$O 2>&1
+archive=`echo wget-*.tar.gz`
+mv "$archive" $DEST_DIR
+echo "$archive"
 
 cd ..