summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-05-08 21:15:48 -0400
committerGlenn Morris <rgm@gnu.org>2015-05-08 21:15:48 -0400
commit63bee24f74ebd24ed7816c930efb463485b862c7 (patch)
treedd74a2a0d42e79054cd1d3edb667f84388742922 /build-aux
parentdeb845418b4c5728170f30f7f9b9f930979a562d (diff)
* 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.
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/gitlog-to-emacslog23
1 files changed, 11 insertions, 12 deletions
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 28953d725f..4cf2ed6190 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -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"