Commit 63bee24f authored by Glenn Morris's avatar Glenn Morris

* build-aux/gitlog-to-emacslog: Get rid of "distprefix".

* Makefile.in (ChangeLog): No longer pass "distprefix".
* make-dist: Update "make ChangeLog" syntax for the above change.
parent deb84541
......@@ -1100,10 +1100,9 @@ CHANGELOG_HISTORY_INDEX_MAX = 2
CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX)
# Convert git commit log to ChangeLog file. make-dist uses this.
# I guess this is PHONY because it generates in distprefix (which is
# non-nil when called from make-dist)?
# I guess this is PHONY so it always updates?
ChangeLog:
$(AM_V_GEN)distprefix=$(distprefix) srcprefix=$(srcdir)/ \
$(AM_V_GEN)srcprefix=$(srcdir)/ \
$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
# Check that we are in a good state for changing history.
......
......@@ -39,36 +39,36 @@ while [ $# -gt 0 ]; do
shift
done
if [ -f "${distprefix}$output" ]; then
[ ! "$force" ] && echo "${distprefix}$output exists" && exit 1
rm -f "${distprefix}$output" || exit 1
if [ -f "$output" ]; then
[ ! "$force" ] && echo "$output exists" && exit 1
rm -f "$output" || exit 1
fi
# If this is not a Git repository, just generate an empty ChangeLog.
test -d ${srcprefix}.git || {
>"${distprefix}$output"
>"$output"
exit
}
# Use Gnulib's packaged ChangeLog generator.
${srcprefix}build-aux/gitlog-to-changelog --ignore-matching='^; ' \
--format='%B' \
"$gen_origin.." >"${distprefix}ChangeLog.tmp" || exit
"$gen_origin.." >"ChangeLog.tmp" || exit
if test -s "${distprefix}ChangeLog.tmp"; then
if test -s "ChangeLog.tmp"; then
# Fix up bug references.
# This would be better as eg a --transform option to gitlog-to-changelog,
# but... effort. FIXME does not handle rare cases like:
# Fixes: debbugs:19434 debbugs:19519
sed 's/ Fixes: \(debbugs:\|bug#\)\([0-9][0-9]*\)/ (Bug#\2)/' \
"${distprefix}ChangeLog.tmp" > "${distprefix}ChangeLog.tmp2"
mv "${distprefix}ChangeLog.tmp2" "${distprefix}ChangeLog.tmp"
"ChangeLog.tmp" > "ChangeLog.tmp2"
mv "ChangeLog.tmp2" "ChangeLog.tmp"
# Find the years covered by the generated ChangeLog, so that
# a proper copyright notice can be output.
years=`
sed -n 's/^\([0-9][0-9]*\).*/\1/p' "${distprefix}ChangeLog.tmp" |
sed -n 's/^\([0-9][0-9]*\).*/\1/p' "ChangeLog.tmp" |
sort -nu
`
start_year=
......@@ -93,9 +93,8 @@ if test -s "${distprefix}ChangeLog.tmp"; then
s/\(Copyright[ (C)]*\)[0-9]*-[0-9]*/\1'"$year_range"'/
p
}
' <ChangeLog.$nmax >>"${distprefix}ChangeLog.tmp" || exit
' <ChangeLog.$nmax >>"ChangeLog.tmp" || exit
fi
# Install the generated ChangeLog.
test "$output" = "ChangeLog.tmp" || \
mv -i "${distprefix}ChangeLog.tmp" "${distprefix}$output"
test "$output" = "ChangeLog.tmp" || mv "ChangeLog.tmp" "$output"
......@@ -279,7 +279,7 @@ mkdir ${tempdir}
if test -d .git; then
echo "Making top-level ChangeLog"
make distprefix=${tempdir}/ ChangeLog
make ChangeLog CHANGELOG=${tempdir}/ChangeLog
else
echo "No repository, so omitting top-level ChangeLog"
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment