Fix formatting of output.

diff --git a/etc/update-rcs-log b/etc/update-rcs-log
index c7b3181ced14528c494d5eed1a7c81163fb841c5..2ce8d0eaac9cd486ae55924eb6fcc27b6f1bd33e 100755 (executable)
--- a/etc/update-rcs-log
+++ b/etc/update-rcs-log
@@ -9,16 +9,22 @@ exec > /scheme/etc/update-rcs-log.out 2>&1
 
 export PATH="/usr/local/bin:${PATH}"
 
+CVS2CL="$(which cvs2cl)"
+if [ -z "${CVS2CL}" ]; then
+    echo "cvs2cl not found."
+    exit 1
+fi
+
+COMMON="--revisions --usermap /scheme/v7/src/etc/usermap --domain zurich.csail.mit.edu --stdout --no-wrap --separate-header"
 GOPTS_SCHEME="-d :ext:anoncvs@subversions.gnu.org:/cvsroot/mit-scheme"
 GOPTS_HTML="-d :ext:anoncvs@savannah.gnu.org:/webcvs/mit-scheme"
-UM="/scheme/v7/src/etc/usermap"
 O="ChangeLog"
 N="${O}.new"
 
 generate_log_gopts ()
 {
     cd "${1}"
-    cvs2cl --global-opts "${2}" --revisions --usermap "${UM}" --stdout > "${N}"
+    cvs2cl --global-opts "${2}" ${COMMON} > "${N}"
     if cmp "${N}" "${O}"; then
        rm -f "${N}"
     elif [ -s "${N}" ]; then
@@ -38,7 +44,7 @@ generate_log_gopts /scheme/v7/html "${GOPTS_HTML}"
 generate_log ()
 {
     cd "${1}"
-    cvs2cl --revisions --usermap "${UM}" --stdout > "${N}"
+    cvs2cl ${COMMON} > "${N}"
     if cmp "${N}" "${O}"; then
        rm -f "${N}"
     else