From 1e6347d8b985c539ddce9bce71b3483ace55ec74 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 16 May 2002 17:43:21 +0000 Subject: Makefile.in: Allow for PWDCMD to override hardcoded pwd. * 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. From-SVN: r53523 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/Makefile.am | 14 ++++++++------ libstdc++-v3/Makefile.in | 14 ++++++++------ libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/aclocal.m4 | 2 +- libstdc++-v3/configure | 2 +- libstdc++-v3/docs/html/Makefile | 3 ++- 7 files changed, 30 insertions(+), 16 deletions(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d94791b..60f7ff0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2002-05-16 Rainer Orth + + * Makefile.am: Allow for PWDCMD to override hardcoded pwd. + * acinclude.m4: Likewise. + * docs/html/Makefile: Likewise. + * aclocal.m4: Regenerate. + * configure: Regenerate. + * Makefile.in: Regenerate. + 2002-05-15 Loren J. Rittle libstdc++/6641 diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index a4b11a7..b4bceb2 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -29,6 +29,8 @@ SUBDIRS = include libio libmath libsupc++ src po testsuite mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs +PWD = $${PWDCMD-pwd} + # These two special 'check-script' rules use the bash script 'mkcheck' # to do testing. This script is not as portable as the dejagnu test # harness, and is thus off by default. It does produce interesting @@ -46,20 +48,20 @@ check-script-install: $(top_builddir)/mkcheck # These rules are messy, but are hella worth it. doxygen: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=user $${srcdir} $${builddir}) doxygen-maint: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=maint $${srcdir} $${builddir}) doxygen-man: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=man $${srcdir} $${builddir}) diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index f832cb3..a337a00 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -160,6 +160,8 @@ SUBDIRS = include libio libmath libsupc++ src po testsuite mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs +PWD = $${PWDCMD-pwd} + # Multilib support. MAKEOVERRIDES = @@ -501,20 +503,20 @@ check-script-install: $(top_builddir)/mkcheck # These rules are messy, but are hella worth it. doxygen: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=user $${srcdir} $${builddir}) doxygen-maint: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=maint $${srcdir} $${builddir}) doxygen-man: - -(srcdir=`cd ${top_srcdir}; pwd`; \ - builddir=`pwd`; \ + -(srcdir=`cd ${top_srcdir}; ${PWD}`; \ + builddir=`${PWD}`; \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \ --mode=man $${srcdir} $${builddir}) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 322c20d..f21ef60 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -38,7 +38,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. - glibcpp_builddir=`pwd` + glibcpp_builddir=`${PWDCMD-pwd}` case $srcdir in [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index dc5caa3..d785929 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -50,7 +50,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. - glibcpp_builddir=`pwd` + glibcpp_builddir=`${PWDCMD-pwd}` case $srcdir in [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d1c36f9..ac90ecc 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -1085,7 +1085,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. - glibcpp_builddir=`pwd` + glibcpp_builddir=`${PWDCMD-pwd}` case $srcdir in \\/$* | ?:\\/*) glibcpp_srcdir=${srcdir} ;; *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; diff --git a/libstdc++-v3/docs/html/Makefile b/libstdc++-v3/docs/html/Makefile index a3d04a0..73d2028 100644 --- a/libstdc++-v3/docs/html/Makefile +++ b/libstdc++-v3/docs/html/Makefile @@ -1,3 +1,4 @@ +PWD=$${PWDCMD-pwd} MAKEINFO=makeinfo INC=../../../gcc/doc/include @@ -6,7 +7,7 @@ all: faq/index.txt 17_intro/porting.html 17_intro/porting-howto.html faq/index.txt: faq/index.html - lynx -dump $< | sed "s%file://localhost`pwd`%..%" > $@ + lynx -dump $< | sed "s%file://localhost`${PWD}`%..%" > $@ 17_intro/porting.html: 17_intro/porting.texi ${MAKEINFO} -I ${INC} --html --no-split $< -o $@ -- cgit v1.1