From: ian <ian>
Date: Sun, 24 Aug 1997 23:23:38 +0000 (+0000)
Subject: Bugfix.
X-Git-Tag: release-0-50~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=commitdiff_plain;h=ef98584b41fa22425b74cfda39506d5f49bd34d0

Bugfix.
---

diff --git a/Makefile.in b/Makefile.in
index 5197374..315583b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,8 +104,9 @@ shipprep:	$(SHIPTARGETS)
 ship:		$(SHIPTARGETS)
 		rm -rf shipcheck
 		mkdir -p shipcheck/userv-$(VERSION)
-		cp -av $^ shipcheck/userv-$(VERSION)
-		GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+		cp -a $^ shipcheck/userv-$(VERSION)
+		cd shipcheck && \
+		 GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
 		rm -rf shipcheck/userv-$(VERSION)
 
 linecount:	$(SOURCES)
diff --git a/buildship b/buildship
index bd7876d..f01b03e 100755
--- a/buildship
+++ b/buildship
@@ -11,10 +11,10 @@ version=$1
 targz=userv-$version.tar.gz
 tag=`echo release-$version | sed -e 's/\./-/g'`
 
-echo >&2 "Tagging (version $version, tag $tag) ..."
+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
@@ -22,11 +22,12 @@ make ship VERSION=$version
 
 cd shipcheck
 
-echo >&2 'Checking whether identical to repository version ...'
+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:
@@ -36,12 +37,12 @@ fi
 cd ..
 rm -rf userv
 
-echo >&2 'Doing test build ...'
+echo >&2 '*** Doing test build ...'
 cd userv-$version
 ./configure
 make
 
 cd ../..
 
-echo >&2 "OK.  Distribution file is ../$targz."
+echo >&2 "*** OK.  Distribution file is ../$targz."
 mv -f shipcheck/$targz ..