r15411 - gnucash/trunk/packaging/win32 - Fix Gwenhywfar build in install.sh.

[Andreas Köhler]

Author: andi5
Date: 2007-01-21 14:32:59 -0500 (Sun, 21 Jan 2007)
New Revision: 15411
Trac: http://svn.gnucash.org/trac/changeset/15411

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Fix Gwenhywfar build in install.sh.

* Add $_OPENSSL_UDIR/bin to PATH.
* No need to copy OpenSSL libraries from WINDIR\\system32, because we
  switched to the GnuWin32 package and even checked that system32 is
  clean.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-01-21 19:28:31 UTC (rev 15410)
+++ gnucash/trunk/packaging/win32/install.sh	2007-01-21 19:32:59 UTC (rev 15411)
@@ -319,6 +319,7 @@
 function inst_openssl() {
     setup OpenSSL
     _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+    add_to_env $_OPENSSL_UDIR/bin PATH
     # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
     if test -f $_OPENSSL_UDIR/unins000.exe ; then
 	die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
@@ -632,10 +633,6 @@
 	echo "Gwenhywfar already installed. Skipping."
     else
 	wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
-	# Compiling gwenhywfar needs the openssl DLLs somewhere
-	# outside of WINDOWS_DIR:
-	_WIN_UDIR=`unix_path ${WINDIR}`
-	cp ${_WIN_UDIR}/system32/libssl32.dll ${_WIN_UDIR}/system32/libeay32.dll  ${_OPENSSL_UDIR}/lib || die "OpenSSL is not installed correctly."
 	qpushd $TMP_UDIR/gwenhywfar-*
 	    ./configure \
 		--with-openssl-includes=$_OPENSSL_UDIR/include \