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
echo >&2 '*** Checking whether identical to repository version ...'
tar zxf $targz
cvs co -r $tag userv
-cd userv-$version
-cp -r . ../userv/.
-cd ../userv
+cp userv-$version/* userv/.
+cd userv
if test "x`cvs -n update`" != x
then
echo >&2 mismatch: