suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs: configure and makefile corrections for --prefix installation

Browse Source
This commit is contained in:
Matthew Flatt 2018-10-21 07:04:02 -06:00
parent abc5c9cdef
commit 3c4fa62e28
9 changed files with 92 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
racket/src/Makefile.in
View File

@ -243,19 +243,20 @@ install-gracket-both:
# CS install ----------------------------------------
CS_INSTALL_TARGET = install
CS_SETUP_INSTALL_TARGET = setup-install
install-cs-common:
$(MAKE) install-common-first
cd cs; $(MAKE) $(CS_INSTALL_TARGET)
cd cs; $(MAKE) plain-install
$(MAKE) install-common-middle
cd cs; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
$(MAKE) install-common-last
install-racketcs:
$(MAKE) install-cs-common
plain-install-racketcs:
$(MAKE) install-cs-common CS_INSTALL_TARGET=plain-install
$(MAKE) install-cs-common CS_SETUP_INSTALL_TARGET=no-setup-install
install-cs:
$(MAKE) install-racketcs

8
racket/src/ac/path.m4
View File

@ -108,9 +108,17 @@ AC_SUBST(etcpltdir)
AC_SUBST(includepltdir)
AC_SUBST(docdir)
AC_SUBST(COLLECTS_PATH)
AC_SUBST(GUI_COLLECTS_PATH)
AC_SUBST(GR_APP_COLLECTS_PATH)
AC_SUBST(CONFIG_PATH)
AC_SUBST(GUI_CONFIG_PATH)
AC_SUBST(GR_APP_CONFIG_PATH)
AC_SUBST(MAKE_COPYTREE)
AC_SUBST(MAKE_GRACKET)
AC_SUBST(LIBFINISH)
AC_SUBST(INSTALL_ORIG_TREE)
AC_SUBST(MMM)
AC_SUBST(MMM_INSTALLED)

18
racket/src/cfg-cs
View File

@ -585,6 +585,7 @@ ac_unique_file="setup-go.rkt"
enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
RUN_RACKET_CGC
ICP
MAKE_LOCAL_RACKET
CS_BOOTSTRAP_HELP
@ -596,9 +597,16 @@ CGC
MMM_CAP_INSTALLED
MMM_INSTALLED
MMM
INSTALL_ORIG_TREE
LIBFINISH
MAKE_GRACKET
MAKE_COPYTREE
GR_APP_CONFIG_PATH
GUI_CONFIG_PATH
CONFIG_PATH
GR_APP_COLLECTS_PATH
GUI_COLLECTS_PATH
COLLECTS_PATH
includepltdir
etcpltdir
sharepltdir
@ -2115,6 +2123,14 @@ CS_BOOTSTRAP_HELP="no-3m"
@ -2170,6 +2186,8 @@ MAKE_GRACKET=no
LIBFINISH=echo
ICP=cp
RUN_RACKET_CGC="cs/racketcs"

30
racket/src/cfg-racket
View File

@ -635,12 +635,6 @@ RUN_RACKET_CGC
INSTALL_LIBS_ENABLE
INSTALL_SETUP_RACKET_FLAGS
INSTALL_SETUP_FLAGS
GR_APP_CONFIG_PATH
GUI_CONFIG_PATH
CONFIG_PATH
GR_APP_COLLECTS_PATH
GUI_COLLECTS_PATH
COLLECTS_PATH
LTA
LTO
LIBRACKET_DEP
@ -669,7 +663,6 @@ LIBSFX
OWN_LIBFFI
SO_SUFFIX
EXE_SUFFIX
INSTALL_ORIG_TREE
FRAMEWORK_PREFIX
FRAMEWORK_REL_INSTALL
FRAMEWORK_INSTALL_DIR
@ -735,9 +728,16 @@ CGC
MMM_CAP_INSTALLED
MMM_INSTALLED
MMM
INSTALL_ORIG_TREE
LIBFINISH
MAKE_GRACKET
MAKE_COPYTREE
GR_APP_CONFIG_PATH
GUI_CONFIG_PATH
CONFIG_PATH
GR_APP_COLLECTS_PATH
GUI_COLLECTS_PATH
COLLECTS_PATH
includepltdir
etcpltdir
sharepltdir
@ -3065,6 +3065,14 @@ CS_BOOTSTRAP_HELP="no-3m"
@ -6923,14 +6931,6 @@ LIBS="$LIBS $EXTRALIBS"

18
racket/src/cs/c/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
builddir = @builddir@
PACKAGE = racket
SCHEME_SRC = @SCHEME_SRC@
MAKE_BUILD_SCHEME = @MAKE_BUILD_SCHEME@
MACH = @MACH@
@ -17,14 +19,19 @@ LIBS = @LIBS@
DEFAULT_RACKET = ../racket/racket3m
RACKET = @RACKET@
CS_INSTALLED = cs
CS_INSTALLED = @CS_INSTALLED@
prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
bindir = @bindir@
libdir = @libdir@
includepltdir = @includepltdir@
libpltdir = @libpltdir@
libpltdir_rel = @libpltdir_rel@
etcpltdir = @etcpltdir@
sharepltdir = @sharepltdir@
collectsdir = @collectsdir@
ALLDIRINFO = "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(libpltdir)"
@ -201,8 +208,14 @@ ICP=@ICP@
install:
$(MAKE) plain-install
$(MAKE) setup-install
setup-install:
$(DESTDIR)$(bindir)/racket$(CS_INSTALLED) $(SELF_RACKET_FLAGS) -N raco -l- raco setup $(PLT_SETUP_OPTIONS)
no-setup-install:
echo done
plain-install@NOT_OSX@:
$(MAKE) unix-install
@ -214,10 +227,12 @@ common-install:
$(ICP) racketcs "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)"
$(ICP) starter "$(DESTDIR)$(libpltdir)/starter"
$(ICP) $(srcdir)/../../start/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh"
$(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
unix-install:
$(MAKE) common-install
$(ICP) gracketcs "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)"
$(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
RKTFWDEST = @FRAMEWORK_INSTALL_DIR@/Racket.framework
FRAMEWORK_REL_PREFIX = "@executable_path/../$(libpltdir_rel)/"
@ -233,6 +248,7 @@ macos-install:
cp $(RKTFWDIR)/boot/petite.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/
cp $(RKTFWDIR)/boot/scheme.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/
cp $(RKTFWDIR)/boot/racket.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/
$(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
$(MAKE) macos-install-gracket CS_GR_INSTALLED="`echo $(CS_INSTALLED) | tr a-z A-Z`"
macos-install-gracket:

22
racket/src/cs/c/configure vendored
View File

@ -622,6 +622,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
CS_INSTALLED
FRAMEWORK_PREFIX
FRAMEWORK_INSTALL_DIR
SCHEME_CONFIG_ARGS
@ -661,9 +662,16 @@ CGC
MMM_CAP_INSTALLED
MMM_INSTALLED
MMM
INSTALL_ORIG_TREE
LIBFINISH
MAKE_GRACKET
MAKE_COPYTREE
GR_APP_CONFIG_PATH
GUI_CONFIG_PATH
CONFIG_PATH
GR_APP_COLLECTS_PATH
GUI_COLLECTS_PATH
COLLECTS_PATH
includepltdir
etcpltdir
sharepltdir
@ -2525,6 +2533,11 @@ fi
SUB_CONFIGURE_EXTRAS=
CS_INSTALLED=cs
if test "${enable_csdefault}" = "yes" ; then
CS_INSTALLED=""
fi
############## Install targets ################
PREFIX_PATH_RELATIVE=/../..
@ -2646,6 +2659,14 @@ CS_BOOTSTRAP_HELP="no-3m"
@ -4419,6 +4440,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
makefiles="Makefile"

2
racket/src/cs/c/configure-parent.ac
View File

@ -27,8 +27,10 @@ MAKE_GRACKET=no
LIBFINISH=echo
ICP=cp
RUN_RACKET_CGC="cs/racketcs"
AC_SUBST(ICP)
AC_SUBST(RUN_RACKET_CGC)
makefiles="Makefile"

6
racket/src/cs/c/configure.ac
View File

@ -74,6 +74,11 @@ m4_include(../ac/path_pkgscope.m4)
SUB_CONFIGURE_EXTRAS=
CS_INSTALLED=cs
if test "${enable_csdefault}" = "yes" ; then
CS_INSTALLED=""
fi
############## Install targets ################
PREFIX_PATH_RELATIVE=/../..
@ -413,6 +418,7 @@ AC_SUBST(MAKE_BUILD_SCHEME)
AC_SUBST(SCHEME_CONFIG_ARGS)
AC_SUBST(FRAMEWORK_INSTALL_DIR)
AC_SUBST(FRAMEWORK_PREFIX)
AC_SUBST(CS_INSTALLED)
makefiles="Makefile"

8
racket/src/racket/configure.ac
View File

@ -1499,7 +1499,6 @@ AC_SUBST(NOT_MINGW)
AC_SUBST(FRAMEWORK_INSTALL_DIR)
AC_SUBST(FRAMEWORK_REL_INSTALL)
AC_SUBST(FRAMEWORK_PREFIX)
AC_SUBST(INSTALL_ORIG_TREE)
AC_SUBST(EXE_SUFFIX)
AC_SUBST(SO_SUFFIX)
AC_SUBST(OWN_LIBFFI)
@ -1537,13 +1536,6 @@ AC_SUBST(LIBRACKET_DEP)
AC_SUBST(LTO)
AC_SUBST(LTA)
AC_SUBST(COLLECTS_PATH)
AC_SUBST(GUI_COLLECTS_PATH)
AC_SUBST(GR_APP_COLLECTS_PATH)
AC_SUBST(CONFIG_PATH)
AC_SUBST(GUI_CONFIG_PATH)
AC_SUBST(GR_APP_CONFIG_PATH)
AC_SUBST(INSTALL_SETUP_FLAGS)
AC_SUBST(INSTALL_SETUP_RACKET_FLAGS)