From 51e605c0c24fc59e554d6c8b0ac1a36013b87ac3 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Sat, 21 Apr 2007 20:58:05 +0000 Subject: [PATCH] Fix build for directories with spaces in them by quoting properly. Joachim Wieland --- src/tools/msvc/Install.pm | 2 +- src/tools/msvc/vcregress.bat | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 8f8bc69a66..7e06747537 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -210,7 +210,7 @@ sub GenerateTimezoneFiles my @tzfiles = split /\s+/,$1; unshift @tzfiles,''; print "Generating timezone files..."; - system("$conf\\zic\\zic -d $target/share/timezone " . join(" src/timezone/data/", @tzfiles)); + system("$conf\\zic\\zic -d \"$target/share/timezone\" " . join(" src/timezone/data/", @tzfiles)); print "\n"; } diff --git a/src/tools/msvc/vcregress.bat b/src/tools/msvc/vcregress.bat index 6d42e462ca..b9ae930c62 100644 --- a/src/tools/msvc/vcregress.bat +++ b/src/tools/msvc/vcregress.bat @@ -30,13 +30,13 @@ IF NOT "%2"=="" SET SCHEDULE=%2 SET PERL5LIB=..\..\tools\msvc -if "%what%"=="INSTALLCHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale -if "%what%"=="CHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale --temp-install=./tmp_check --top-builddir=%TOPDIR% --temp-port=%TEMPPORT% +if "%what%"=="INSTALLCHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir="..\..\..\%CONFIG%\psql" --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale +if "%what%"=="CHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir="..\..\..\%CONFIG%\psql" --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale --temp-install=./tmp_check --top-builddir="%TOPDIR%" --temp-port=%TEMPPORT% if "%what%"=="PLCHECK" call :plcheck if "%what%"=="CONTRIBCHECK" call :contribcheck SET E=%ERRORLEVEL% -cd %STARTDIR% +cd "%STARTDIR%" exit /b %E% :usage -- 2.39.5