From ae8c086606f9576a48dbeacf19e902915a6d4c84 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Thu, 23 May 2013 17:54:22 +0200
Subject: [PATCH] install everything from libnfc for windows build

---
 pcsc-relay/win32/Makefile.am | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pcsc-relay/win32/Makefile.am b/pcsc-relay/win32/Makefile.am
index 5885bf4..dd1af6a 100644
--- a/pcsc-relay/win32/Makefile.am
+++ b/pcsc-relay/win32/Makefile.am
@@ -5,7 +5,7 @@ all-local:
 	@echo "Use \`make win\` to cross compile for Windows"
 
 
-IMAGE=$(abs_builddir)/image
+WIN32_DIR = $(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)_win32
 
 
 MINGW ?= i686-w64-mingw32
@@ -13,36 +13,34 @@ MINGW_DIR=/usr/$(MINGW)
 
 
 LIBNFC_DIR=$(abs_builddir)/libnfc
-LIBNFC_DLL=$(IMAGE)/bin/libnfc-4.dll
+LIBNFC_DLL=$(WIN32_DIR)/bin/libnfc-4.dll
 $(LIBNFC_DIR)/configure.ac:
 	git clone git://github.com/frankmorgner/libnfc $(LIBNFC_DIR)
 $(LIBNFC_DLL): $(LIBNFC_DIR)/configure.ac
-	cd $(LIBNFC_DIR) && env MINGW=$(MINGW) sh mingw-cross-configure.sh --prefix=$(IMAGE)
-	make -C $(LIBNFC_DIR) install
+	cd $(LIBNFC_DIR) && env MINGW=$(MINGW) sh mingw-cross-configure.sh --prefix=/
+	make -C $(LIBNFC_DIR) install DESTDIR=$(WIN32_DIR)
 
 
-PCSC_RELAY_EXE=$(IMAGE)/bin/pcsc-relay.exe
+PCSC_RELAY_EXE=$(WIN32_DIR)/bin/pcsc-relay.exe
 $(PCSC_RELAY_EXE): $(LIBNFC_DLL)
-	cd $(abs_top_builddir) && ./configure \
-		--prefix=$(IMAGE) \
+	cd $(top_builddir) && ./configure \
+		--prefix=/ \
 		--host=$(MINGW) --target=$(MINGW) \
-		PKG_CONFIG_LIBDIR=$(IMAGE)/lib/pkgconfig \
+		PKG_CONFIG_SYSROOT_DIR=$(WIN32_DIR) \
+		PKG_CONFIG_LIBDIR=$(WIN32_DIR)/lib/pkgconfig \
 		CFLAGS=-I$(MINGW_DIR)/include \
 		LDFLAGS=-L$(MINGW_DIR)/lib \
 		PCSC_LIBS="-lwinscard"
-	make -C $(abs_top_builddir) install
+	make -C $(top_builddir) install DESTDIR=$(WIN32_DIR)
 
 
 LIBUSB_DLL=$(LIBNFC_DIR)/libusb-win32-bin-*/bin/x86/libusb0_x86.dll
-WIN32_DIR=$(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)_win32
 win: $(PCSC_RELAY_EXE)
-	$(INSTALL) -d $(WIN32_DIR)
-	$(INSTALL_PROGRAM) -t $(WIN32_DIR) \
-		$(LIBNFC_DLL) $(PCSC_RELAY_EXE)
-	$(INSTALL_PROGRAM) $(LIBUSB_DLL) $(WIN32_DIR)/libusb0.dll
+
+#$(INSTALL_PROGRAM) $(LIBUSB_DLL) $(WIN32_DIR)/libusb0.dll
 
 clean-local:
-	rm -rf $(IMAGE) $(WIN32_DIR)
+	rm -rf $(WIN32_DIR)
 	test ! -d $(LIBNFC_DIR) || \
 		make -C $(LIBNFC_DIR) clean