r1926: *** empty log message ***

diff --git a/cvsbp-prepare b/cvsbp-prepare
new file mode 100755 (executable)
index 0000000..8fb3290
--- /dev/null
+++ b/cvsbp-prepare
@@ -0,0 +1,7 @@
+rm -f upload.sh make-dist.sh make-doc.sh cvsbp-prepare
+rm -f `find . -type f -name .cvsignore`
+if [ -f doc/Makefile ]; then
+  pushd doc > /dev/null
+  make
+  popd > /dev/null
+fi

diff --git a/make-dist.sh b/make-dist.sh
index e1f548dbd82e05c98c3a8d330ec8f1ff87f7702b..1013cab4511b497d39dabfcc4e4201d5c579f972 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,4 +1,5 @@
 #!/bin/bash 
+#
 # Creates debian and upstream packages
 # Programmer: Kevin Rosenberg
 
@@ -30,10 +31,9 @@ while [ $# != 0 ]; do
     shift
 done
 
-
 DEBPKG=cl-uffi
 PKG=uffi
-TOPDIR=`basename $PWD`
+TOPDIR=`pwd`
 
 VERSION=`cat VERSION`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
@@ -41,6 +41,10 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_cvs_buildpackage} ]; then
+  export CVSROOT=`cat CVS/Root`
+fi
+
 if [ ! -z ${opt_tag} ]; then
   DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
   UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
@@ -92,11 +96,13 @@ if [ -z ${opt_cvs_buildpackage} ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
+  cd ..
 else
-  cvsbp
+  cd ${TOPDIR}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC ${DEBPKG}
+  cd ..
 fi
 
-cd ..
 rm -rf ${DEBDIR}
 
 echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"