-if test -d .git; then
- echo "Making top-level ChangeLog"
- make ChangeLog CHANGELOG=${tempdir}/ChangeLog
-else
- echo "No repository, so omitting top-level ChangeLog"
+if [ "$changelog" = yes ]; then
+ if test -d .git; then
+ echo "Making top-level ChangeLog"
+ make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \
+ { x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; }
+ else
+ echo "No repository, so omitting top-level ChangeLog"
+ fi