Skip to content

Commit

Permalink
Add a configure option to specify name of the installed squeak run sc…
Browse files Browse the repository at this point in the history
…ript.

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).
  • Loading branch information
David T. Lewis committed Sep 4, 2021
1 parent 6f28534 commit a385f5b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion platforms/unix/config/Makefile.install
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions platforms/unix/config/configure
Expand Up @@ -766,6 +766,7 @@ datarootdir
libexecdir
sbindir
bindir
scriptname
program_transform_name
prefix
exec_prefix
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ;;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions platforms/unix/config/make.cfg.in
Expand Up @@ -44,6 +44,8 @@ srcdir= @vmmdir@
vmmcfg= @vmmcfg@
blddir= @blddir@

scriptname= @scriptname@

top_builddir= @blddir@

prefix= @prefix@
Expand Down

0 comments on commit a385f5b

Please sign in to comment.