r2147: *** empty log message ***

diff --git a/debian/rules b/debian/rules
index 51b0565c2bed26f2b8f708453355230187157510..ea9c3a7f5c960380ba78bd15dfc8c67250b96f13 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ INSTALLDIRFLAGS       := -d -g root -o root -m 0755
 SOURCEDIR      := $(prefix)/usr/share/common-lisp/source/${pkg}
 DOCDIR         := $(prefix)/usr/share/doc/${debpkg}
 
-UPSTREAM_VER   := $(shell sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
+UPSTREAM_VER   := $(shell sed -n -e "s/${debpkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
 
 clc-source     := $(SOURCEDIR)-$(UPSTREAM_VER)
 
@@ -60,6 +60,7 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/uffi.
+       $(INSTALL) $(INSTALLDIRFLAGS) $(clc-source)
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl *.system) $(clc-source)
        $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(clc-source)/mcl
        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html

diff --git a/make-upstream.sh b/make-upstream.sh
index 2acb3ae5a6852b10977c11b8d35df1f67f6f4d86..d9454917f6ce07ab53b9fb38e7a0f4a44c81a0ff 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -12,17 +12,23 @@ usage () {
 Usage: $progname [options]
 Creates upstream archives
 Options:
+  -c   Commit and tag CVS tree with current version numbers
   -t   Tag CVS tree with current version numbers
+  -f   Force creation of upstream archive, even if exists'
   -h   Print this brief help
 EOF
 }
 
+opt_force=0
+
 # Command line
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
+        -c)  opt_commit=1; opt_tag=1 ;;
         -t)  opt_tag=1               ;;
+       -f)  opt_force=1             ;;
          *)  usage; exit 0           ;;
     esac
     shift