From:	pavenis AT lanet DOT lv
Message-ID:	<B0000089563@stargate.astr.lu.lv>
To:	Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>, djgpp-workers AT delorie DOT com
Date:	Mon, 7 Jun 1999 14:26:33 +0300
MIME-Version:	1.0
Subject:	Re: egcs-19990602 (gcc-2.95 prerelease) binaries for testing
References:	<B0000089535 AT stargate DOT astr DOT lu DOT lv>
In-reply-to:	<Pine.SUN.3.91.990607132948.2943H-100000@is>
X-mailer:	Pegasus Mail for Win32 (v3.11)
Reply-To:	djgpp-workers AT delorie DOT com

On 7 Jun 99, at 13:30, Eli Zaretskii wrote:

> 
> On Mon, 7 Jun 1999 pavenis AT lanet DOT lv wrote:
> 
> > 	No /dev/env (or similar) hacks used. The idea how to force $DJDIR
> >       into prefix was "stolen" from GPC sources (thanks GPC developers for
> >       hont)
> 
> Could you please tell how this works?
> 

You can see it from patch for top level Makefile.in (not all changes are related of course).
Of course I should do this also for nested configure calls but that is more simple.

Andris

--- Makefile.in.orig	Thu May 20 15:26:36 1999
+++ Makefile.in	Sat Jun  5 19:58:28 1999
@@ -37,8 +37,9 @@
 mandir=${prefix}/man
 gxx_include_dir=${includedir}/g++
 
-tooldir = $(exec_prefix)/$(target_alias)
-build_tooldir = $(exec_prefix)/$(target_alias)
+short_target_alias = $(target_alias)
+tooldir = $(exec_prefix)/$(short_target_alias)
+build_tooldir = $(exec_prefix)/$(short_target_alias)
 
 
 program_transform_name =
@@ -55,7 +56,7 @@
 infodir = $(prefix)/info
 includedir = $(prefix)/include
 # Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+libsubdir = $(libdir)/gcc-lib/$(short_target_alias)/$(gcc_version)
 GDB_NLM_DEPS = 
 
 SHELL = /bin/sh
@@ -211,7 +212,7 @@
 	$(INSTALL_DOSREL)
 
 CC_FOR_TARGET = ` \
-  if [ -f $$r/gcc/xgcc ] ; then \
+  if [ -x $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
         echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -
L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -
idirafter $$s/newlib/libc/include -nostdinc; \
@@ -236,7 +237,7 @@
 GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -I$(build_tooldir)/include
 
 CHILL_FOR_TARGET = ` \
-  if [ -f $$r/gcc/xgcc ] ; then \
+  if [ -x $$r/gcc/xgcc ] ; then \
     echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -L$$r/gcc/ch/runtime/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
@@ -247,7 +248,7 @@
   fi`
 
 CXX_FOR_TARGET = ` \
-  if [ -f $$r/gcc/xgcc ] ; then \
+  if [ -x $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
         echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -
L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter 
$$s/newlib/libc/include -nostdinc; \
@@ -400,28 +401,28 @@
 	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
 	"YACC=$(YACC)" \
-	"bindir=$(bindir)" \
-	"datadir=$(datadir)" \
-	"exec_prefix=$(exec_prefix)" \
-	"includedir=$(includedir)" \
-	"infodir=$(infodir)" \
-	"libdir=$(libdir)" \
-	"libexecdir=$(libexecdir)" \
-	"lispdir=$(lispdir)" \
-	"localstatedir=$(localstatedir)" \
-	"mandir=$(mandir)" \
-	"oldincludedir=$(oldincludedir)" \
-	"prefix=$(prefix)" \
-	"sbindir=$(sbindir)" \
-	"sharedstatedir=$(sharedstatedir)" \
-	"sysconfdir=$(sysconfdir)" \
-	"tooldir=$(tooldir)" \
-	"build_tooldir=$(build_tooldir)" \
-	"gxx_include_dir=$(gxx_include_dir)" \
+	"bindir=`echo '$(bindir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"datadir=`echo '$(datadir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"exec_prefix=`echo '$(exec_prefix)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"includedir=`echo '$(includedir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"infodir=`echo '$(infodir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"libdir=`echo '$(libdir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"libexecdir=`echo '$(libexecdir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"lispdir=`echo '$(lispdir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"localstatedir=`echo '$(localstatedir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"mandir=`echo '$(mandir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"oldincludedir=`echo '$(oldincludedir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"prefix=`echo '$(prefix)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"sbindir=`echo '$(sbindir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"sharedstatedir=`echo '$(sharedstatedir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"sysconfdir=`echo '$(sysconfdir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"tooldir=`echo '$(tooldir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"build_tooldir=`echo '$(build_tooldir)' | sed -e 's/\\$$/\\\\&&/g'`" \
+	"gxx_include_dir=`echo '$(gxx_include_dir)' | sed -e 's/\\$$/\\\\&&/g'`" \
 	"gcc_version=$(gcc_version)" \
 	"gcc_version_trigger=$(gcc_version_trigger)" \
-	"target_alias=$(target_alias)" \
-	"libsubdir=$(libsubdir)"
+	"target_alias=$(short_target_alias)" \
+	"libsubdir=`echo '$(libsubdir)' | sed -e 's/\\$$/\\\\&&/g'`"
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.

- Raw text -