r1964: *** empty log message ***

diff --git a/cvsbp-prepare b/cvsbp-prepare
index c4f321ac27e2f86c4490490ad5dca25a31f97738..8e70e0a6f1587f9d248ebb4f1e905acdefaf3a50 100755 (executable)
--- a/cvsbp-prepare
+++ b/cvsbp-prepare
@@ -1,12 +1,17 @@
 #!/bin/bash
 
+set -e  # abort on error
+
 # Make documentation to put in debian package 
 # This must match prebuilt upstream documentation
 
-if [ -d doc/Makefile ]; then
+if [ -f doc/Makefile ]; then
   cd doc
   make all
   cd ..
+else
+  echo "Unable to build documentation for CVS checked out package"
+  exit 1
 fi
 
 # Clean checked out CVS directory

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
new file mode 100755 (executable)
index 0000000..8e70e0a
--- /dev/null
+++ b/cvsbp-prepare.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e  # abort on error
+
+# Make documentation to put in debian package 
+# This must match prebuilt upstream documentation
+
+if [ -f doc/Makefile ]; then
+  cd doc
+  make all
+  cd ..
+else
+  echo "Unable to build documentation for CVS checked out package"
+  exit 1
+fi
+
+# Clean checked out CVS directory
+rm -f upload.sh make-dist.sh make-doc.sh make-upstream.sh make-debian.sh
+rm -f `find . -type f -name .cvsignore`
+rm -f cvsbp-prepare

diff --git a/make-upstream.sh b/make-upstream.sh
index 3a87216a836a655e80a1f3495b96b805e3b3817d..71b6632e80b3864d691bf2fdc3149de4a98700f1 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -53,7 +53,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-dist.sh cvsbp-prepare 
+rm -f upload.sh make-upload.sh make-debian.sh cvsbp-prepare.sh 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`