Use a separate manpage date for strace-log-merge.1

strace-log-merge.1 used cause confusion by sharing the manpage date
with strace.1.

* Makefile.am (dist-hook): Rename MANPAGE_DATE to STRACE_MANPAGE_DATE,
generate $(distdir)/doc/.strace-log-merge.1.in.date.
* configure.ac (manpage_date): Rename to strace_manpage_date.
(slm_manpage_date): Define from doc/strace-log-merge.1.in.
(MANPAGE_DATE): Rename to STRACE_MANPAGE_DATE.
(SLM_MANPAGE_DATE): Define to slm_manpage_date.
* doc/strace-log-merge.1.in: Replace MANPAGE_DATE with SLM_MANPAGE_DATE.
* doc/strace.1.in: Replace MANPAGE_DATE with STRACE_MANPAGE_DATE.
* strace.spec.in: Likewise, generate doc/.strace-log-merge.1.in.date.

5 files changed, 16 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 7b00c8f90..89b860fde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,10 @@ $(srcdir)/.version:
 dist-hook:
 	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
 	${AM_V_GEN}echo $(COPYRIGHT_YEAR) > $(distdir)/.year
-	${AM_V_GEN}echo $(MANPAGE_DATE) > $(distdir)/doc/.strace.1.in.date
+	${AM_V_GEN}echo $(STRACE_MANPAGE_DATE) \
+		> $(distdir)/doc/.strace.1.in.date
+	${AM_V_GEN}echo $(SLM_MANPAGE_DATE) \
+		> $(distdir)/doc/.strace-log-merge.1.in.date
 
 today = $(shell LC_TIME=C date -u +%Y-%m-%d)
 version_regexp = $(subst .,\.,$(VERSION))
diff --git a/configure.ac b/configure.ac
index 8bd21d26b..1f1611136 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,10 @@ AC_INIT([strace],
 	[strace],
 	[https://strace.io])
 m4_define([copyright_year], st_esyscmd_s([./build-aux/copyright-year-gen .year]))
-m4_define([manpage_date], st_esyscmd_s([./build-aux/file-date-gen doc/strace.1.in]))
+m4_define([strace_manpage_date],
+	  st_esyscmd_s([./build-aux/file-date-gen doc/strace.1.in]))
+m4_define([slm_manpage_date],
+	  st_esyscmd_s([./build-aux/file-date-gen doc/strace-log-merge.1.in]))
 m4_define([linux_version_code],
 	  st_esyscmd_s([sed '/^#define LINUX_VERSION_CODE /!d;s///;q' bundled/linux/include/uapi/linux/version.h]))
 AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.])
@@ -46,8 +49,10 @@ AX_CODE_COVERAGE
 AC_DEFINE([COPYRIGHT_YEAR], "[copyright_year]", [Current copyright year.])
 AC_SUBST([COPYRIGHT_YEAR], [copyright_year])
 
-AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date])
-AC_SUBST([MANPAGE_DATE], [manpage_date])
+AC_DEFINE([STRACE_MANPAGE_DATE], "[strace_manpage_date]", [Date])
+AC_SUBST([STRACE_MANPAGE_DATE], [strace_manpage_date])
+AC_DEFINE([SLM_MANPAGE_DATE], "[slm_manpage_date]", [Date])
+AC_SUBST([SLM_MANPAGE_DATE], [slm_manpage_date])
 
 AC_C_BIGENDIAN
 
diff --git a/doc/strace-log-merge.1.in b/doc/strace-log-merge.1.in
index bdd894795..23c72a31f 100644
--- a/doc/strace-log-merge.1.in
+++ b/doc/strace-log-merge.1.in
@@ -11,7 +11,7 @@
 .    BR "\\$1"
 ..
 .\"
-.TH STRACE-LOG-MERGE 1 "@MANPAGE_DATE@" "strace @VERSION@"
+.TH STRACE-LOG-MERGE 1 "@SLM_MANPAGE_DATE@" "strace @VERSION@"
 .\"
 .SH NAME
 strace-log-merge \- merge strace \-ff \-tt output
diff --git a/doc/strace.1.in b/doc/strace.1.in
index b716a06bd..624f819cd 100644
--- a/doc/strace.1.in
+++ b/doc/strace.1.in
@@ -33,7 +33,7 @@
 .  el \
 .    BR "\\$1"
 ..
-.TH STRACE 1 "@MANPAGE_DATE@" "strace @VERSION@"
+.TH STRACE 1 "@STRACE_MANPAGE_DATE@" "strace @VERSION@"
 .SH NAME
 strace \- trace system calls and signals
 .SH SYNOPSIS
diff --git a/strace.spec.in b/strace.spec.in
index 0c0ef3064..9f0a651ee 100644
--- a/strace.spec.in
+++ b/strace.spec.in
@@ -62,7 +62,8 @@ received by a process.
 %setup -q
 echo -n %version-%release > .tarball-version
 echo -n @COPYRIGHT_YEAR@ > .year
-echo -n @MANPAGE_DATE@ > doc/.strace.1.in.date
+echo -n @STRACE_MANPAGE_DATE@ > doc/.strace.1.in.date
+echo -n @SLM_MANPAGE_DATE@ > doc/.strace-log-merge.1.in.date
 
 %build
 echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'