diff --git a/racket/src/configure b/racket/src/configure index 31475b26c4..152d29f6d1 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -637,7 +637,9 @@ CGC MMM_CAP_INSTALLED MMM_INSTALLED MMM +GUI_CONFIG_PATH CONFIG_PATH +GUI_COLLECTS_PATH COLLECTS_PATH includepltdir etcpltdir @@ -2970,6 +2972,9 @@ else INSTALL_ORIG_TREE=no fi +GUI_COLLECTS_PATH="${COLLECTS_PATH}" +GUI_CONFIG_PATH="${CONFIG_PATH}" + ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then @@ -4635,7 +4640,9 @@ case "$host_os" in MZINSTALLBINDIR="${MZINSTALLBINDIR}/.." EXE_SUFFIX=".exe" COLLECTS_PATH="collects" + GUI_COLLECTS_PATH="../collects" CONFIG_PATH="etc" + GUI_CONFIG_PATH="../etc" skip_iconv_check=yes check_for_mprotect=no @@ -6836,6 +6843,8 @@ LIBS="$LIBS $EXTRALIBS" + + diff --git a/racket/src/gracket/Makefile.in b/racket/src/gracket/Makefile.in index 2e6ce4e061..7bdf0793b8 100644 --- a/racket/src/gracket/Makefile.in +++ b/racket/src/gracket/Makefile.in @@ -209,7 +209,7 @@ install-wx_xt-cgc: $(MAKE) @MRLIBINSTALL@-cgc-wx_xt cd ..; $(ICP) gracket/gracket@CGC@ "$(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: $(NOOP) @@ -224,7 +224,7 @@ install-wx_xt-3m: $(MAKE) @MRLIBINSTALL@-3m-wx_xt cd ..; $(ICP) gracket/gracket@MMM@ "$(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: $(NOOP) diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 71ce6cdfe7..9d0e0d5a39 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -248,6 +248,9 @@ else INSTALL_ORIG_TREE=no fi +GUI_COLLECTS_PATH="${COLLECTS_PATH}" +GUI_CONFIG_PATH="${CONFIG_PATH}" + ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then @@ -766,7 +769,9 @@ case "$host_os" in MZINSTALLBINDIR="${MZINSTALLBINDIR}/.." EXE_SUFFIX=".exe" COLLECTS_PATH="collects" + GUI_COLLECTS_PATH="../collects" CONFIG_PATH="etc" + GUI_CONFIG_PATH="../etc" skip_iconv_check=yes check_for_mprotect=no AC_DEFINE(HAVE_STDINT_H,1,[Have stdint.h]) @@ -1741,7 +1746,9 @@ AC_SUBST(etcpltdir) AC_SUBST(includepltdir) AC_SUBST(docdir) AC_SUBST(COLLECTS_PATH) +AC_SUBST(GUI_COLLECTS_PATH) AC_SUBST(CONFIG_PATH) +AC_SUBST(GUI_CONFIG_PATH) AC_SUBST(MMM) AC_SUBST(MMM_INSTALLED)