Fix a PowerShell syntax error.

Also handle the case when GSSBINDIR parameter is given as an empty string in psqodbcm_cpu.wxs.

diff --git a/installer/buildX64-installer.ps1 b/installer/buildX64-installer.ps1
index e09e4abc04cec514bc7cb5db0b273d6823bfebb0..1a325c1f2f972f879f39ec6fea2fa97dac452010 100755 (executable)
--- a/installer/buildX64-installer.ps1
+++ b/installer/buildX64-installer.ps1
@@ -21,7 +21,7 @@ if ($USE_LIBPQ -eq "yes")
            $pgmfs = "$env:ProgramFiles"
            $LIBPQBINDIR = "$pgmfs\PostgreSQL\$LIBPQVER\bin"
        }
-       else if ("${env:ProgramW6432}" -ne "") {
+       elseif ("${env:ProgramW6432}" -ne "") {
            $pgmfs = "$env:ProgramW6432"
            $LIBPQBINDIR = "$pgmfs\PostgreSQL\$LIBPQVER\bin"
        }

diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs
index cef960991a8d33e53a5745364582002d2384f54b..a13209a6dd7bb67b4220958448cf40a2fa25bb08 100644 (file)
--- a/installer/psqlodbcm_cpu.wxs
+++ b/installer/psqlodbcm_cpu.wxs
@@ -69,6 +69,7 @@
 <?endif ?>
 
 <?ifdef var.GSSBINDIR ?>
+<?if "$(var.GSSBINDIR)" != "" ?>
 <?if $(var.BIT64) = no ?>
      <!-- GSSAPI -->
           <File Id="gssapi32.dll" Name="gssapi32.dll" Source="$(var.GSSBINDIR)\gssapi32.dll" />
@@ -88,6 +89,7 @@
           <File Id="krb5_64.dll" Name="krb5_64.dll" Source="$(var.GSSBINDIR)\krb5_64.dll" />
           <File Id="k5sprt64.dll" Name="k5sprt64.dll" Source="$(var.GSSBINDIR)\k5sprt64.dll" />
 <?endif ?>
+<?endif ?>
 <?endif ?>