From 828c610f31bc8ad4c1a14fc238accbb15e5cf959 Mon Sep 17 00:00:00 2001 From: Christian Cornelssen Date: Thu, 17 May 2018 19:57:58 +0200 Subject: configure: Fall back to `pwd` if `pwd -W` does not work This enables configure runs under Cygwin. Also (re)move an unused curdir=`pwd`. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 86cba6652..9b4891c4e 100755 --- a/configure +++ b/configure @@ -124,9 +124,10 @@ case $srcdir in *) # Use a Windows path on windows. case "$OS" in - Windows_NT) abs_srcdir="`pwd -W`/$srcdir" ;; - *) abs_srcdir=`pwd`/$srcdir ;; + Windows_NT) curdir=`pwd -W 2>/dev/null || pwd` ;; + *) curdir=`pwd` ;; esac + abs_srcdir=$curdir/$srcdir ;; esac @@ -346,7 +347,6 @@ fi # Also update dist/windows/mcode/default_paths.ads if you change this # template. echo "Generate default_paths.ads" -curdir=`pwd` sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \ -e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \ -e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \ -- cgit v1.2.3