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

fix GRacket paths for MinGW build

Browse Source
This commit is contained in:
Matthew Flatt 2015-08-30 07:01:10 -06:00
parent ad4dcdeac0
commit 1b778bf34b
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
racket/src/configure vendored
View File

@ -637,7 +637,9 @@ CGC
MMM_CAP_INSTALLED MMM_CAP_INSTALLED
MMM_INSTALLED MMM_INSTALLED
MMM MMM
GUI_CONFIG_PATH
CONFIG_PATH CONFIG_PATH
GUI_COLLECTS_PATH
COLLECTS_PATH COLLECTS_PATH
includepltdir includepltdir
etcpltdir etcpltdir
@ -2970,6 +2972,9 @@ else
INSTALL_ORIG_TREE=no INSTALL_ORIG_TREE=no
fi fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
###### Make sure GRacket is really there ###### ###### Make sure GRacket is really there ######
if test "${enable_gracket}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
@ -4635,7 +4640,9 @@ case "$host_os" in
MZINSTALLBINDIR="${MZINSTALLBINDIR}/.." MZINSTALLBINDIR="${MZINSTALLBINDIR}/.."
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
COLLECTS_PATH="collects" COLLECTS_PATH="collects"
GUI_COLLECTS_PATH="../collects"
CONFIG_PATH="etc" CONFIG_PATH="etc"
GUI_CONFIG_PATH="../etc"
skip_iconv_check=yes skip_iconv_check=yes
check_for_mprotect=no check_for_mprotect=no
@ -6836,6 +6843,8 @@ LIBS="$LIBS $EXTRALIBS"

4
racket/src/gracket/Makefile.in
View File

@ -209,7 +209,7 @@ install-wx_xt-cgc:
$(MAKE) @MRLIBINSTALL@-cgc-wx_xt $(MAKE) @MRLIBINSTALL@-cgc-wx_xt
cd ..; $(ICP) gracket/gracket@CGC@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@" cd ..; $(ICP) gracket/gracket@CGC@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"
cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@" cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"
@RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @COLLECTS_PATH@ @CONFIG_PATH@ @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@
install-wx_xt-cgc-final: install-wx_xt-cgc-final:
$(NOOP) $(NOOP)
@ -224,7 +224,7 @@ install-wx_xt-3m:
$(MAKE) @MRLIBINSTALL@-3m-wx_xt $(MAKE) @MRLIBINSTALL@-3m-wx_xt
cd ..; $(ICP) gracket/gracket@MMM@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@" cd ..; $(ICP) gracket/gracket@MMM@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"
cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@" cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"
@RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @COLLECTS_PATH@ @CONFIG_PATH@ @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@
install-wx_xt-3m-final: install-wx_xt-3m-final:
$(NOOP) $(NOOP)

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

@ -248,6 +248,9 @@ else
INSTALL_ORIG_TREE=no INSTALL_ORIG_TREE=no
fi fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
###### Make sure GRacket is really there ###### ###### Make sure GRacket is really there ######
if test "${enable_gracket}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
@ -766,7 +769,9 @@ case "$host_os" in
MZINSTALLBINDIR="${MZINSTALLBINDIR}/.." MZINSTALLBINDIR="${MZINSTALLBINDIR}/.."
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
COLLECTS_PATH="collects" COLLECTS_PATH="collects"
GUI_COLLECTS_PATH="../collects"
CONFIG_PATH="etc" CONFIG_PATH="etc"
GUI_CONFIG_PATH="../etc"
skip_iconv_check=yes skip_iconv_check=yes
check_for_mprotect=no check_for_mprotect=no
AC_DEFINE(HAVE_STDINT_H,1,[Have stdint.h]) AC_DEFINE(HAVE_STDINT_H,1,[Have stdint.h])
@ -1741,7 +1746,9 @@ AC_SUBST(etcpltdir)
AC_SUBST(includepltdir) AC_SUBST(includepltdir)
AC_SUBST(docdir) AC_SUBST(docdir)
AC_SUBST(COLLECTS_PATH) AC_SUBST(COLLECTS_PATH)
AC_SUBST(GUI_COLLECTS_PATH)
AC_SUBST(CONFIG_PATH) AC_SUBST(CONFIG_PATH)
AC_SUBST(GUI_CONFIG_PATH)
AC_SUBST(MMM) AC_SUBST(MMM)
AC_SUBST(MMM_INSTALLED) AC_SUBST(MMM_INSTALLED)