From a385f5b69e7bda720e980dd61e683a0bf4810cd7 Mon Sep 17 00:00:00 2001
From: "David T. Lewis" <lewis@mail.msen.com>
Date: Sat, 4 Sep 2021 15:15:10 -0400
Subject: [PATCH] Add a configure option to specify name of the installed
 squeak run script. When running configure from a ./mvm script, the following
 command line option is now available:

  --scriptname=SCRIPT     run script name installed in PREFIX [squeak]

This allows the various mvm scripts to specify scriptname such that
sudo make install will install /usr/local/bin/spur64 for a 64-bit spur VM,
/usr/local/bin/cog for a 32-bit cog VM, and so forth. Does not affect
naming of squeak.sh, which may be subject to similar name space conflicts.
A corresponding update has been made to the cmake/configure installation
for the classic interpreter VM (squeakvm.org SVN repository).
---
 platforms/unix/config/Makefile.install |  2 +-
 platforms/unix/config/configure        | 10 ++++++++++
 platforms/unix/config/make.cfg.in      |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/platforms/unix/config/Makefile.install b/platforms/unix/config/Makefile.install
index e4d13d96e4..598f0c3008 100644
--- a/platforms/unix/config/Makefile.install
+++ b/platforms/unix/config/Makefile.install
@@ -20,7 +20,7 @@ install-squeak : $(squeak) $(squeaksh) $(binsqueaksh) getversion
 	$(MKINSTALLDIRS) $(ROOT)$(bindir)
 	$(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir)
 	$(INSTALL_SCRIPT) $(squeaksh) $(ROOT)$(exec_prefix)/$(squeak)
-	$(INSTALL_SCRIPT) $(binsqueaksh) $(ROOT)$(bindir)/$(squeak)
+	$(INSTALL_SCRIPT) $(binsqueaksh) $(ROOT)$(bindir)/$(scriptname)
 	if test -n "$(VM_APP_ICONS)"; then \
 	  $(INSTALL_DATA) $(ICONS) $(ROOT)$(VM_APP_ICONS); \
 	fi
diff --git a/platforms/unix/config/configure b/platforms/unix/config/configure
index 7a3375bc8c..26db16e58b 100755
--- a/platforms/unix/config/configure
+++ b/platforms/unix/config/configure
@@ -766,6 +766,7 @@ datarootdir
 libexecdir
 sbindir
 bindir
+scriptname
 program_transform_name
 prefix
 exec_prefix
@@ -884,6 +885,9 @@ libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
 
+# Start script name, e.g. /usr/bin/squeak
+scriptname='squeak'
+
 ac_prev=
 ac_dashdash=
 for ac_option
@@ -990,6 +994,11 @@ do
   | --exec=* | --exe=* | --ex=*)
     exec_prefix=$ac_optarg ;;
 
+  -scriptname | --scriptname | -script | --script)
+    ac_prev=scriptname ;;
+  -scriptname=* | --scriptname=* | -script=* | --script=*)
+    scriptname=$ac_optarg ;;
+
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
@@ -1408,6 +1417,7 @@ Installation directories:
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
+  --scriptname=SCRIPT     run script name installed in PREFIX [squeak]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
diff --git a/platforms/unix/config/make.cfg.in b/platforms/unix/config/make.cfg.in
index 0519fc9440..ba25184c12 100644
--- a/platforms/unix/config/make.cfg.in
+++ b/platforms/unix/config/make.cfg.in
@@ -44,6 +44,8 @@ srcdir=		@vmmdir@
 vmmcfg=		@vmmcfg@
 blddir=		@blddir@
 
+scriptname=	@scriptname@
+
 top_builddir=	@blddir@
 
 prefix=		@prefix@