Get the PG utilities from the same place as the libpq we're using.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7619 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pkg/win32/src/pgadmin3.wxs b/pkg/win32/src/pgadmin3.wxs
index 98280675f1307516d95a593b2116892e9cc2f81b..2c11123792d162aaf7875ae0422be24f77d9e189 100644 (file)
--- a/pkg/win32/src/pgadmin3.wxs
+++ b/pkg/win32/src/pgadmin3.wxs
@@ -269,10 +269,10 @@
                         </Directory>\r
 \r
                         <Component Id="postgresql_exes" Guid="{3FD9C660-73B1-4A30-A53A-6E121CB83139}">\r
-                            <File Id="postgresql_exes.psql.exe" Name="psql.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/psql.exe" />\r
-                            <File Id="postgresql_exes.pg_dump.exe" Name="pg_dump.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_dump.exe" />\r
-                            <File Id="postgresql_exes.pg_dumpall.exe" Name="pg_dumpall.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_dumpall.exe" />\r
-                            <File Id="postgresql_exes.pg_restore.exe" Name="pg_restore.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_restore.exe" />\r
+                            <File Id="postgresql_exes.psql.exe" Name="psql.exe" DiskId="1" Source="$(var.PGDIR)/bin/psql.exe" />\r
+                            <File Id="postgresql_exes.pg_dump.exe" Name="pg_dump.exe" DiskId="1" Source="$(var.PGDIR)/bin/pg_dump.exe" />\r
+                            <File Id="postgresql_exes.pg_dumpall.exe" Name="pg_dumpall.exe" DiskId="1" Source="$(var.PGDIR)/bin/pg_dumpall.exe" />\r
+                            <File Id="postgresql_exes.pg_restore.exe" Name="pg_restore.exe" DiskId="1" Source="$(var.PGDIR)/bin/pg_restore.exe" />\r
                         </Component>\r
 \r
                         <Directory Id="i18nDir" Name="i18n">\r