Use program files environment var in installer per Johann Zuschlag

diff --git a/installer/Make.bat b/installer/Make.bat
index 94c71b8da095425e8017e194422a17098aa5d6e2..e795fc34a73d2cbd6b5e31d64cffa7ff5deb5a54 100644 (file)
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -1,4 +1,4 @@
-@echo off\r
+rem @echo off\r
 \r
 if NOT "%1"=="" SET VERSION="%1"\r
 if NOT "%1"=="" GOTO GOT_VERSION\r
@@ -13,7 +13,7 @@ echo.
 echo.\r
 echo Building psqlODBC merge module...\r
 \r
-candle -nologo -dVERSION=%VERSION% psqlodbcm.wxs\r
+candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbcm.wxs\r
 IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
 \r
 light -nologo -out psqlodbc.msm psqlodbcm.wixobj\r
@@ -22,7 +22,7 @@ IF ERRORLEVEL 1 GOTO ERR_HANDLER
 echo.\r
 echo Building psqlODBC installer database...\r
 \r
-candle -nologo -dVERSION=%VERSION% psqlodbc.wxs\r
+candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs\r
 IF ERRORLEVEL 1 GOTO ERR_HANDLER\r
 \r
 light -nologo psqlodbc.wixobj\r

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index 753e120c13d4555cbb51c982526a55b918910fee..b47b70f71509f7fa3a7a0fb196416fe571d9790a 100644 (file)
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -24,19 +24,19 @@
           <!-- PostgreSQL -->
           <File Id="psqlodbca.dll" LongName="psqlodbca.dll" Name="psqlodxA.dll" src="../ANSI-Release/psqlodbca.dll" />
           <File Id="psqlodbcw.dll" LongName="psqlodbcw.dll" Name="psqlodxW.dll" src="../Unicode-Release/psqlodbcw.dll" />
-          <File Id="libpq.dll" Name="libpq.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
+          <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
           
           <!-- Gettext -->
-          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libintl-2.dll" />
-          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libiconv-2.dll" />
+          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libintl-2.dll" />
+          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libiconv-2.dll" />
           
           <!-- SSL -->
-          <File Id="libeay32.dll" Name="libeay32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\libeay32.dll" />
-          <File Id="ssleay32.dll" Name="ssleay32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\ssleay32.dll" />
+          <File Id="libeay32.dll" Name="libeay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libeay32.dll" />
+          <File Id="ssleay32.dll" Name="ssleay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\ssleay32.dll" />
  
           <!-- MIT Kerberos -->
-          <File Id="comerr32.dll" Name="comerr32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\comerr32.dll" />
-          <File Id="krb5_32.dll" Name="krb5_32.dll" src="C:\Program Files\PostgreSQL\8.1\bin\krb5_32.dll" />
+          <File Id="comerr32.dll" Name="comerr32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\comerr32.dll" />
+          <File Id="krb5_32.dll" Name="krb5_32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\krb5_32.dll" />
           
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->