From 62f0a88cfe3db246b1d12b0bc7868aed9788e889 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date: Thu, 16 May 2002 17:43:21 +0000
Subject: 	* Makefile.in: Allow for PWDCMD to override hardcoded pwd. 
 * config-ml.in: Likewise. 	* configure: Likewise. 	* configure.in:
 Likewise.

	boehm-gc:
	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

	config:
	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.

	contrib:
	* test_installed: Allow for PWDCMD to override hardcoded pwd.
	* test_summary: Likewise.

	gcc:
	* Makefile.in: Allow for PWDCMD to override hardcoded pwd.
	* configure.in: Likewise.
	* fixinc/check.tpl: Likewise.
	* fixinc/fixinc.dgux: Likewise.
	* fixinc/fixinc.svr4: Likewise.
	* fixinc/fixinc.winnt: Likewise.
	* fixinc/fixincl.sh: Likewise.
	* fixproto: Likewise.
	* configure: Regenerate.

	gcc/ada:
	* Makefile.adalib: Allow for PWDCMD to override hardcoded pwd.
	* Makefile.in: Likewise.

	gcc/f:
	* Make-lang.in: Allow for PWDCMD to override hardcoded pwd.

	gcc/java:
	* Make-lang.in: Allow for PWDCMD to override hardcoded pwd.

	gcc/po:
	* exgettext: Allow for PWDCMD to override hardcoded pwd.

	gcc/treelang:
	* Make-lang.in: Allow for PWDCMD to override hardcoded pwd.

	libf2c:
	* Makefile.in: Allow for PWDCMD to override hardcoded pwd.
	* aclocal.m4: Likewise.
	* configure: Regenerate.

	libjava:
	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
	* configure.in: Likewise.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

	libobjc:
	* aclocal.m4: Allow for PWDCMD to override hardcoded pwd.
	* configure: Regenerate.

	libstdc++-v3:
	* Makefile.am: Allow for PWDCMD to override hardcoded pwd.
	* acinclude.m4: Likewise.
	* docs/html/Makefile: Likewise.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* Makefile.in: Regenerate.

	zlib:
	* configure.in: Allow for PWDCMD to override hardcoded pwd.
	* configure: Regenerate.

	* ChangeLog: Move entries to ChangeLog.gcj.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@53523 138bc75d-0d04-0410-961f-82ee72b054a4
---
 config-ml.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'config-ml.in')

diff --git a/config-ml.in b/config-ml.in
index a2780356a0c..8a000d30d3a 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -527,14 +527,16 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ]
 
 cat > Multi.tem <<\EOF
 
+PWD=$${PWDCMD-pwd}
+
 # FIXME: There should be an @-sign in front of the `if'.
 # Leave out until this is tested a bit more.
 multi-do:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  rootpre=`pwd`/; export rootpre; \
-	  srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \
+	  rootpre=`${PWD}`/; export rootpre; \
+	  srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \
 	  lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
 	  compiler="$(CC)"; \
 	  for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
@@ -570,7 +572,7 @@ multi-clean:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+	  lib=`${PWD} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
 	  for dir in Makefile $(MULTIDIRS); do \
 	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
@@ -677,10 +679,10 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
   if [ "${ml_verbose}" = --verbose ]; then
     echo "Running configure in multilib subdirs ${multidirs}"
-    echo "pwd: `pwd`"
+    echo "pwd: `${PWDCMD-pwd}`"
   fi
 
-  ml_origdir=`pwd`
+  ml_origdir=`${PWDCMD-pwd}`
   ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
   # cd to top-level-build-dir/${with_target_subdir}
   cd ..
@@ -689,7 +691,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     if [ "${ml_verbose}" = --verbose ]; then
       echo "Running configure in multilib subdir ${ml_dir}"
-      echo "pwd: `pwd`"
+      echo "pwd: `${PWDCMD-pwd}`"
     fi
 
     if [ -d ${ml_dir} ]; then true; else
@@ -717,7 +719,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     case ${srcdir} in
     ".")
-      echo Building symlink tree in `pwd`/${ml_dir}/${ml_libdir}
+      echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
       if [ "${with_target_subdir}" != "." ]; then
 	ml_unsubdir="../"
       else
-- 
cgit v1.2.3