r2136: *** empty log message ***

diff --git a/Makefile b/Makefile
index 5e2958182686c73cdc5d1bf7eed601e13fdd6fbb..69e3b133b2f61934ddaa351929edc140ccf1134f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.19 2002/05/15 17:10:28 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.20 2002/06/20 13:34:55 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -33,19 +33,12 @@ $(LIBSUBDIRS):
 distclean: clean
        @$(MAKE) -C doc $@
 
-VERSION=$(shell cat VERSION)
-DISTDIR=$(PKG)-$(VERSION)
-DIST_TARBALL=$(DISTDIR).tar.gz
-DIST_ZIP=$(DISTDIR).zip
 SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
        COPYING.CLSQL COPYING.MaiSQL README INSTALL ChangeLog NEWS TODO \
        set-logical.cl clsql-uffi.system \
        clsql.system clsql-aodbc.system clsql-mysql.system \
        clsql-postgresql.system clsql-postgresql-socket.system
 
-VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
-TAG=dist_$(VERSION_UNDERSCORE)
-
 .PHONY: doc
 doc:
        $(MAKE) -C doc
@@ -54,3 +47,4 @@ doc:
 dist: clean
        @$(MAKE) -C doc $@
 
+

diff --git a/VERSION b/VERSION
deleted file mode 100644 (file)
index faef31a..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.7.0

diff --git a/make-upstream.sh b/make-upstream.sh
index 70994b14d68ad86cc34b0eade62fba9d6e85b7ca..a42794e32b6a32f17eee0533265bced72865435a 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -19,6 +19,8 @@ Options:
 EOF
 }
 
+opt_force=0
+
 # Command line
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"