From 69298c96a58593514c2d8479a3442ade187fdc3a Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sun, 4 Feb 2024 21:23:57 -0500
Subject: [PATCH] Make the version of rem2html track the version of Remind.

---
 .gitignore                         | 1 +
 Makefile                           | 2 +-
 configure                          | 3 ++-
 configure.in                       | 2 +-
 rem2html/{rem2html => rem2html.in} | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename rem2html/{rem2html => rem2html.in} (99%)

diff --git a/.gitignore b/.gitignore
index af2296a1..30f7d326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ man/remind.1
 man/tkremind.1
 pm_to_blib
 rem2html/Makefile
+rem2html/rem2html
 rem2html/rem2html.1
 rem2pdf/Makefile.PL
 rem2pdf/Makefile.old
diff --git a/Makefile b/Makefile
index d8bc76c6..0565b820 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ test:
 	@$(MAKE) -C src -s test
 
 distclean: clean
-	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf
+	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
 
 src/Makefile: src/Makefile.in
 	./configure
diff --git a/configure b/configure
index b6f34ae1..7445a37e 100755
--- a/configure
+++ b/configure
@@ -4218,7 +4218,7 @@ VERSION=04.02.09
 
 
 
-ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1"
+ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4910,6 +4910,7 @@ do
     "www/Makefile") CONFIG_FILES="$CONFIG_FILES www/Makefile" ;;
     "src/version.h") CONFIG_FILES="$CONFIG_FILES src/version.h" ;;
     "rem2html/Makefile") CONFIG_FILES="$CONFIG_FILES rem2html/Makefile" ;;
+    "rem2html/rem2html") CONFIG_FILES="$CONFIG_FILES rem2html/rem2html" ;;
     "rem2pdf/Makefile.PL") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.PL" ;;
     "rem2pdf/Makefile.top") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.top" ;;
     "rem2pdf/bin/rem2pdf") CONFIG_FILES="$CONFIG_FILES rem2pdf/bin/rem2pdf" ;;
diff --git a/configure.in b/configure.in
index 5906f3f5..fbfd5a9c 100644
--- a/configure.in
+++ b/configure.in
@@ -93,6 +93,6 @@ AC_SUBST(VERSION)
 AC_SUBST(PERL)
 AC_SUBST(PERLARTIFACTS)
 AC_SUBST(RELEASE_DATE)
-AC_CONFIG_FILES([src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1])
+AC_CONFIG_FILES([src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1])
 AC_OUTPUT
 chmod a+x rem2pdf/bin/rem2pdf
diff --git a/rem2html/rem2html b/rem2html/rem2html.in
similarity index 99%
rename from rem2html/rem2html
rename to rem2html/rem2html.in
index 2e38c5fd..132b7cea 100644
--- a/rem2html/rem2html
+++ b/rem2html/rem2html.in
@@ -10,7 +10,7 @@ use Encode;
 
 my %Options;
 
-my $rem2html_version = '2.1';
+my $rem2html_version = '@VERSION@';
 
 my($days, $shades, $moons, $classes, $Month, $Year, $Numdays, $Firstwkday, $Mondayfirst, $weeks,
     @Daynames, $Nextmon, $Nextlen, $Prevmon, $Prevlen);