From: dpage <dpage@a7884b65-44f6-0310-8a51-81a127f17b15>
Date: Thu, 12 Mar 2009 10:57:41 +0000 (+0000)
Subject: Get the dependency DLLs from the PostgreSQL directory.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3bc5022cb3444737dd4c0cac76aab37d9242dbee;p=users%2Fquan74%2Fpgadmin-import.git

Get the dependency DLLs from the PostgreSQL directory.

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

diff --git a/pkg/win32/src/pgadmin3.wxs b/pkg/win32/src/pgadmin3.wxs
index f75269af7..b53acd9c3 100644
--- a/pkg/win32/src/pgadmin3.wxs
+++ b/pkg/win32/src/pgadmin3.wxs
@@ -31,18 +31,18 @@
 
                         <Component Id="core_libs" Guid="{8440EDF6-F11F-46DC-8962-F93A0A5198EF}">
                             <File Id="core_libs.libpq.dll" Name="libpq.dll" DiskId="1" Source="$(var.PGDIR)/bin/libpq.dll" />
-                            <File Id="core_libs.libiconv_2.dll" Name="libiconv-2.dll" DiskId="1" Source="$(var.PGBUILD)/gettext/bin/libiconv-2.dll" />
-                            <File Id="core_libs.libintl_8.dll" Name="libintl-8.dll" DiskId="1" Source="$(var.PGBUILD)/gettext/bin/libintl-8.dll" />
-                            <File Id="core_libs.libeay32.dll" Name="libeay32.dll" DiskId="1" Source="$(var.PGBUILD)/openssl/bin/libeay32.dll" />
-                            <File Id="core_libs.ssleay32.dll" Name="ssleay32.dll" DiskId="1" Source="$(var.PGBUILD)/openssl/bin/ssleay32.dll" />
-                            <File Id="core_libs.comerr32.dll" Name="comerr32.dll" DiskId="1" Source="$(var.PGBUILD)/krb5/bin/i386/comerr32.dll" />
-                            <File Id="core_libs.gssapi32.dll" Name="gssapi32.dll" DiskId="1" Source="$(var.PGBUILD)/krb5/bin/i386/gssapi32.dll" />
-                            <File Id="core_libs.krb5_32.dll" Name="krb5_32.dll" DiskId="1" Source="$(var.PGBUILD)/krb5/bin/i386/krb5_32.dll" />
-                            <File Id="core_libs.k5sprt32.dll" Name="k5sprt32.dll" DiskId="1" Source="$(var.PGBUILD)/krb5/bin/i386/k5sprt32.dll" />
-                            <File Id="core_libs.iconv.dll" Name="iconv.dll" DiskId="1" Source="$(var.PGBUILD)/iconv/bin/iconv.dll" />
-                            <File Id="core_libs.libxml2.dll" Name="libxml2.dll" DiskId="1" Source="$(var.PGBUILD)/libxml2/bin/libxml2.dll" />
-                            <File Id="core_libs.libxslt.dll" Name="libxslt.dll" DiskId="1" Source="$(var.PGBUILD)/libxslt/bin/libxslt.dll" />
-                            <File Id="core_libs.zlib1.dll" Name="zlib1.dll" DiskId="1" Source="$(var.PGBUILD)/zlib/zlib1.dll" />
+                            <File Id="core_libs.libiconv_2.dll" Name="libiconv-2.dll" DiskId="1" Source="$(var.PGDIR)/bin/libiconv-2.dll" />
+                            <File Id="core_libs.libintl_8.dll" Name="libintl-8.dll" DiskId="1" Source="$(var.PGDIR)/bin/libintl-8.dll" />
+                            <File Id="core_libs.libeay32.dll" Name="libeay32.dll" DiskId="1" Source="$(var.PGDIR)/bin/libeay32.dll" />
+                            <File Id="core_libs.ssleay32.dll" Name="ssleay32.dll" DiskId="1" Source="$(var.PGDIR)/bin/ssleay32.dll" />
+                            <File Id="core_libs.comerr32.dll" Name="comerr32.dll" DiskId="1" Source="$(var.PGDIR)/bin/comerr32.dll" />
+                            <File Id="core_libs.gssapi32.dll" Name="gssapi32.dll" DiskId="1" Source="$(var.PGDIR)/bin/gssapi32.dll" />
+                            <File Id="core_libs.krb5_32.dll" Name="krb5_32.dll" DiskId="1" Source="$(var.PGDIR)/bin/krb5_32.dll" />
+                            <File Id="core_libs.k5sprt32.dll" Name="k5sprt32.dll" DiskId="1" Source="$(var.PGDIR)/bin/k5sprt32.dll" />
+                            <File Id="core_libs.iconv.dll" Name="iconv.dll" DiskId="1" Source="$(var.PGDIR)/bin/iconv.dll" />
+                            <File Id="core_libs.libxml2.dll" Name="libxml2.dll" DiskId="1" Source="$(var.PGDIR)/bin/libxml2.dll" />
+                            <File Id="core_libs.libxslt.dll" Name="libxslt.dll" DiskId="1" Source="$(var.PGDIR)/bin/libxslt.dll" />
+                            <File Id="core_libs.zlib1.dll" Name="zlib1.dll" DiskId="1" Source="$(var.PGDIR)/bin/zlib1.dll" />
                             <File Id="core_libs.msvcr71.dll" Name="msvcr71.dll" DiskId="1" Source="$(var.SYSTEM32DIR)/msvcr71.dll" />
                         </Component>