[pkg-opensc-commit] [pkcs11-helper] 215/253: build: msvc: allow override openssl location better

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit cde1c5b6662836bbcf0bffa0f53878f7cb357c0e
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Tue Feb 21 01:33:33 2012 +0200

    build: msvc: allow override openssl location better
---
 lib/Makefile.w32-vc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc
index 4e0498e..83aca1b 100644
--- a/lib/Makefile.w32-vc
+++ b/lib/Makefile.w32-vc
@@ -66,8 +66,11 @@ OPENSSL_STATIC = libeay32.lib
 OPENSSL_DYNAMIC = libeay32.lib
 #OPENSSL_DYNAMIC = libeay32d.lib
 
-OPENSSL_CFLAGS=-I$(OPENSSL_HOME)/inc32 -DENABLE_PKCS11H_OPENSSL
-OPENSSL_LIBS=-LIBPATH:$(OPENSSL_HOME)\out32 user32.lib advapi32.lib $(OPENSSL_STATIC)
+OPENSSL_INC=$(OPENSSL_HOME)\include
+OPENSSL_LIB=$(OPENSSL_HOME)\lib
+
+OPENSSL_CFLAGS=-I$(OPENSSL_INC) -DENABLE_PKCS11H_OPENSSL
+OPENSSL_LIBS=-LIBPATH:$(OPENSSL_LIB) user32.lib advapi32.lib $(OPENSSL_STATIC)
 !endif
 
 CFLAGS = -I../include $(OPENSSL_CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN -D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_WIN32_WINNT=0x0400

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git