From 62869ae55f3a368ad18545ab6d8973bffffb239f Mon Sep 17 00:00:00 2001
From: Alex Chernyakhovsky <achernya@google.com>
Date: Sun, 5 Mar 2023 20:52:52 -0500
Subject: Rename VERSION to VERSION.stamp

-I$(top_srcdir) is not usable on macOS due to a conflicting C++ header
 `version`.
---
 .gitignore              |  1 +
 Makefile.am             | 16 ++++++++--------
 macosx/build.sh         |  2 +-
 scripts/Makefile.am     |  4 ++--
 src/include/Makefile.am |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d1b8da..b6218a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,5 +35,6 @@ src/include/config.h.in~
 src/include/stamp-h1
 /test-driver
 /VERSION
+/VERSION.stamp
 /scripts/mosh
 src/include/version.h
diff --git a/Makefile.am b/Makefile.am
index fcd08da..da401ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ include $(top_srcdir)/aminclude_static.am
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = scripts src man conf
 EXTRA_DIST = autogen.sh ocb-license.html README.md COPYING.iOS
-BUILT_SOURCES = VERSION
+BUILT_SOURCES = VERSION.stamp
 AM_DISTCHECK_CONFIGURE_FLAGS += --enable-compile-warnings=distcheck --enable-examples --enable-syslog
 
 # AX_CODE_COVERAGE configuration
@@ -31,22 +31,22 @@ OCLINT_OPTIONS = -enable-global-analysis -max-priority-2=1000 -max-priority-3=10
 	-rc SHORT_VARIABLE_NAME=1 \
 	-rc MINIMUM_CASES_IN_SWITCH=2
 
-.PHONY:	VERSION
+.PHONY:	VERSION.stamp
 
-VERSION:
+VERSION.stamp:
 	@echo @PACKAGE_STRING@ > VERSION.dist
 	@set -e; if git describe --dirty --always > VERSION.git 2>&1 && \
 		[ -z `git rev-parse --show-prefix` ]; then \
-		if ! diff -q VERSION.git VERSION > /dev/null 2>&1; then \
-			mv -f VERSION.git VERSION; \
+		if ! diff -q VERSION.git VERSION.stamp > /dev/null 2>&1; then \
+			mv -f VERSION.git VERSION.stamp; \
 		fi; \
-	elif ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \
-		mv -f VERSION.dist VERSION; \
+	elif ! diff -q VERSION.dist VERSION.stamp > /dev/null 2>&1; then \
+		mv -f VERSION.dist VERSION.stamp; \
 	fi
 	@rm -f VERSION.dist VERSION.git
 
 clean-local:
-	@rm -rf VERSION cov-int mosh-coverity.txz compile_commands.json
+	@rm -rf VERSION.stamp cov-int mosh-coverity.txz compile_commands.json
 
 # Linters and static checkers, for development only.  Not included in
 # build dependencies, and outside of Automake processing.
diff --git a/macosx/build.sh b/macosx/build.sh
index acd2860..100c308 100755
--- a/macosx/build.sh
+++ b/macosx/build.sh
@@ -102,7 +102,7 @@ perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' "$PREFIX/local/bin/mosh"
 
 popd > /dev/null
 
-PACKAGE_VERSION=$(cat ../VERSION)
+PACKAGE_VERSION=$(cat ../VERSION.stamp)
 
 OUTFILE="$PACKAGE_VERSION.pkg"
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5ce9ea0..1f0f656 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -4,7 +4,7 @@ if BUILD_CLIENT
 endif
 CLEANFILES = $(bin_SCRIPTS)
 
-mosh:	mosh.pl ../VERSION Makefile
+mosh:	mosh.pl ../VERSION.stamp Makefile
 	perl -Mdiagnostics -c $(srcdir)/mosh.pl
-	@sed -e "s/\@VERSION\@/`cat ../VERSION`/" -e "s/\@PACKAGE_STRING\@/@PACKAGE_STRING@/" $(srcdir)/mosh.pl > mosh
+	@sed -e "s/\@VERSION\@/`cat ../VERSION.stamp`/" -e "s/\@PACKAGE_STRING\@/@PACKAGE_STRING@/" $(srcdir)/mosh.pl > mosh
 	@chmod a+x mosh
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index bd15b83..bcc865a 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -4,7 +4,7 @@ nodist_INCLUDES = version.h
 clean-local:
 	@rm -rf version.h
 
-version.h:	../../VERSION
+version.h:	../../VERSION.stamp
 	@test -s $<
 	@printf '#define BUILD_VERSION "%s"\n' "$$(cat $<)" > $@.new
 	@set -e; if ! diff -q $@ $@.new > /dev/null 2>&1; then \
-- 
cgit v1.2.3