[Bug 236] can't write to $PWD in configure, etc.

Applied Lee's patch to change the (often) reserved word PWD to PWDCMD,
which allows us to mess with it with impunity. Thanks!

diff --git a/Makefile.in b/Makefile.in
index edf3452df7858db57b20e5d9aa03327116e49460..f945b2aae9c5a5777a2716ec30d1a86d8db8609d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -317,7 +317,7 @@ package::
 product::
        test -d dist || ${MKDIR} dist
        ${RM} -f dist/rawidb
-       SRC=`${PWD}` RAWIDB=`${PWD}`/dist/rawidb ${MAKE} install
+       SRC=`${PWDCMD}` RAWIDB=`${PWDCMD}`/dist/rawidb ${MAKE} install
        ${RM} -f dist/idb
        ${SORT} -u +4 dist/rawidb > dist/idb
        ${GENDIST} -v -dist dist -idb dist/idb -sbase `pwd` -spec ${SRCDIR}/dist/hylafax.spec

diff --git a/configure b/configure
index 4fdaec2ce18f448baa8e9b4cb539d48a44cccafe..5ca269058eca35f0d914870c19e8f3ea770a9679 100755 (executable)
--- a/configure
+++ b/configure
@@ -218,7 +218,7 @@ PORT
 PORTFUNCS
 PROTOTYPES
 PSPACKAGE      PS
-PWD
+PWDCMD
 RANLIB
 REGEX
 REGEXINC
@@ -3388,8 +3388,7 @@ test "$MV"        || MV=`findAppDef mv $PATH mv`
 test "$RMCMD"  || RMCMD=`findAppDef rm $PATH rm`
 test "$SORT"   || SORT=`findAppDef sort $PATH sort`
 test "$STRIP"  || STRIP=`findAppDef strip $PATH strip`
-# NB: can't test $PWD 'cuz it's a shell variable
-PWD=`findApp pwd $PATH`           || PWD=pwd
+test "$PWDCMD" || PWDCMD=`findAppDef pwd $PATH pwd`
 
 #
 # Test/verify we know how to create FIFO special files.

diff --git a/defs.in b/defs.in
index 978b379d69900b08c69991f7a6da5dedc768d25b..62fe0369693c7e9d55211fc5eec33ec3277fdaa0 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -81,7 +81,7 @@ ECHO          = @ECHO@
 FUSER          = @FUSER@
 GREP           = @GREP@
 RM             = @RM@
-PWD            = @PWD@
+PWDCMD         = @PWDCMD@
 MKDIR          = @MKDIR@
 NAWK           = @AWK@
 SED            = @SED@