X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=buildship;h=e10562b2c09eba7ca89e416f3976f00ecb2f7bc7;hp=f5a66d9197f8080b07ebd007463f1b5f94078490;hb=2c8651e76d5629948778fb1b3d15ccc591d14da0;hpb=6a900447c4f4db3de50c1f4ef77477e153c1dbb2

diff --git a/buildship b/buildship
index f5a66d9..e10562b 100755
--- a/buildship
+++ b/buildship
@@ -2,19 +2,14 @@
 # to release, check out a fresh copy and then run this
 
 set -e
-if test $# = 0
-then
-	echo >&2 'usage: buildship <version>'
-	exit 1
-fi
-version=$1
+version="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' Changelog`"
 targz=userv-$version.tar.gz
 tag=`echo release-$version | sed -e 's/\./-/g'`
 
 echo >&2 "*** Tagging (version $version, tag $tag) ..."
 cvs tag -F -c $tag
 
-echo >&2 'Generating pre-built files ...'
+echo >&2 '*** Generating pre-built files ...'
 autoconf
 autoheader
 ./configure
@@ -25,8 +20,9 @@ cd shipcheck
 echo >&2 '*** Checking whether identical to repository version ...'
 tar zxf $targz
 cvs co -r $tag userv
-cp userv-$version/* userv/.
-cd userv
+cd userv-$version
+cp -r . ../userv/.
+cd ../userv
 if test "x`cvs -n update`" != x
 then
 	echo >&2 mismatch: