From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Feb 2024 11:17:01 +0000 (+0100)
Subject: build: Tweak ChangeLog generation.
X-Git-Tag: v0.23~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ac75826b48ca9b584f924302f0049bdf0b570f;p=thirdparty%2Fgettext.git

build: Tweak ChangeLog generation.

* Makefile.am (gen-ChangeLogs): Untabify rule. Pass option '--no-cluster'.
---

diff --git a/Makefile.am b/Makefile.am
index 94fbcf878..62aa363dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,22 +109,22 @@ dist-hook: gen-ChangeLogs
 gen_start_date = 2015-10-13
 .PHONY: gen-ChangeLogs
 gen-ChangeLogs:
-	$(AM_V_GEN)if test -d .git; then				\
-	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
-	  test -e "$$log_fix"						\
-	    && amend_git_log="--amend=$$log_fix"			\
-	    || amend_git_log=;						\
-	  for d in . gettext-runtime/intl gettext-runtime/po		\
-		gettext-tools/po; do					\
-	    test "$$d" = "."						\
-	      && cldir="$(distdir)"					\
-	      || cldir="$(distdir)/$$d";				\
-	    $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	      $$amend_git_log --since=$(gen_start_date) -- "$$d"	\
-		> "$$cldir/cl-t" &&					\
-	    { rm -f "$$cldir/ChangeLog" &&				\
-	      mv "$$cldir/cl-t" "$$cldir/ChangeLog"; };			\
-	  done;								\
+	$(AM_V_GEN)if test -d .git; then                                       \
+	  log_fix="$(srcdir)/build-aux/git-log-fix";                           \
+	  test -e "$$log_fix"                                                  \
+	    && amend_git_log="--amend=$$log_fix"                               \
+	    || amend_git_log=;                                                 \
+	  for d in . gettext-runtime/intl gettext-runtime/po gettext-tools/po; \
+	  do                                                                   \
+	    test "$$d" = "."                                                   \
+	      && cldir="$(distdir)"                                            \
+	      || cldir="$(distdir)/$$d";                                       \
+	    $(top_srcdir)/build-aux/gitlog-to-changelog                        \
+	      $$amend_git_log --no-cluster --since=$(gen_start_date) -- "$$d"  \
+	      > "$$cldir/ChangeLog-t"                                          \
+	      && rm -f "$$cldir/ChangeLog"                                     \
+	      && mv "$$cldir/ChangeLog-t" "$$cldir/ChangeLog";                 \
+	  done;                                                                \
 	fi