r1949: *** empty log message ***

diff --git a/Makefile b/Makefile
index c581a3ecaddf39672bba0ccf6cf738880b17dff5..591bec450a7d569316c92df00966cba388f3711b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.48 2002/05/03 03:53:10 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.49 2002/05/05 11:35:54 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -31,24 +31,10 @@ distclean: clean
 #      ./debian/rules clean
 
 
-VERSION=$(shell cat VERSION)
-PKGNAME=$(PKG)-$(VERSION)
-DISTDIR=$(PKGNAME)
-DIST_TARBALL=$(PKGNAME).tar.gz
-DIST_ORIG_TARBALL=$(PKGNAME).orig.tar.gz
-DIST_ZIP=$(PKGNAME).zip
 SOURCE_FILES=src doc examples Makefile uffi.system uffi.debian.system \
        benchmarks COPYRIGHT README TODO INSTALL ChangeLog NEWS \
        test-examples.cl set-logical.cl 
 
-VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
-TAG=upstream_version_$(VERSION_UNDERSCORE)
-
-.PHONY: tagcvs
-tagcvs:
-       @cvs -q rtag -d $(TAG) $(PKG) > /dev/null
-       @cvs -q tag -F $(TAG) > /dev/null
-
 .PHONY: doc
 doc:
        $(MAKE) -C doc
@@ -69,8 +55,3 @@ freeze:
        cvs -q rtag -d frozen uffi
        cvs -q tag -F frozen .
 
-.PHONY: cleandists
-cleandists:
-       @rm -rf ../${PKG}-*.tar.gz ../${PKG}-*.zip
-       @rm -rf ../$(DEBPKG)_*gz ../${DEBPKG}*.changes ../${DEBPKG}*.deb ../${DEBPKG}*.dsc
-

diff --git a/make-dist.sh b/make-dist.sh
index 387f1707222fcdbe704dac4de21b210be9e75e24..d92e693c4b5a151da52c6dc8c5db10002d3f5d79 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -35,7 +35,7 @@ DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`pwd`
 
-VERSION=`cat VERSION`
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9]).*/\1/p" < debian/changelog  |head -1`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
 PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
@@ -69,7 +69,7 @@ echo "Cleaning distribution directory ${DISTDIR}"
 rm -f ${DISTDIR}/upload.sh ${DISTDIR}/make-dist.sh  ${DISTDIR}/cvsbp-prepare 
 rm -f `find ${DISTDIR} -type f -name .cvsignore`
 rm -rf `find ${DISTDIR} -type d -name CVS`
-rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*'  -or -name '#*#'`
+rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*'  -or -name '#*#'` -or -name '.#*'
 rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`