From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 11 Apr 2011 12:45:06 +0000 (+0200)
Subject: Re-enable make check now that it works.
X-Git-Tag: v1.5.1~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a67888ec556623b40f7423492c531757c240ffba;p=yubikey-personalization

Re-enable make check now that it works.
---

diff --git a/ykpers4win.mk b/ykpers4win.mk
index a9b6cb2..e1cc3ff 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -1,7 +1,13 @@
 LIBYUBIKEYVERSION=1.7
 YKPERSVERSION=1.5.1
 
-all: ykpers4win32 ykpers4win64
+all: hack-wine ykpers4win32 ykpers4win64
+
+DLLS=$(HOME)/.wine/drive_c/windows/system32
+.PHONY: hack-wine
+hack-wine:
+	test -L $(DLLS)/libyubikey-0.dll || \
+		ln -sv $(PWD)/tmp/root/bin/libyubikey-0.dll $(DLLS)/
 
 ykpers4win:
 	rm -rf tmp && mkdir tmp && cd tmp && \
@@ -22,7 +28,7 @@ ykpers4win:
 	zip -r ../../ykpers-$(YKPERSVERSION)-win$(ARCH).zip *
 
 ykpers4win32:
-	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i686-w64-mingw32 CHECK=
+	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i686-w64-mingw32 CHECK=check
 
 ykpers4win64:
 	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=64 HOST=x86_64-w64-mingw32 CHECK=