From d59d5fb4e87739507d2069ed71f262970d7b0fc6 Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Sat, 26 May 2007 23:19:25 +0200
Subject: [PATCH] work correclty on 64bit systems with 32bit userland

---
 Makefile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 1681706..f844484 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,7 @@
 #a Parallel Cable III
 CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cut -d\. -f1)\"" #-DFORCE_PC3_IDENT
 
-MARCH := $(shell uname -m)
-ifeq ($(MARCH),x86_64)
-CFLAGS += -m64
-else
+ifeq ($(LIBVER),32)
 CFLAGS += -m32
 endif
 
@@ -18,9 +15,7 @@ endif
 SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 
 all: $(SOBJECTS)
-ifeq ($(MARCH),x86_64)
-	@echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version
-endif
+	@file libusb-driver.so | grep x86-64 >/dev/null && echo Built library is 64 bit. Run \`make lib32\' to build a 32 bit version || true
 
 libusb-driver.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-driver.h parport.h jtagkey.h config.h jtagmon.h Makefile
 	$(CC) $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
@@ -29,7 +24,7 @@ libusb-driver-DEBUG.so: usb-driver.c parport.c jtagkey.c config.c jtagmon.c usb-
 	$(CC) -DDEBUG $(CFLAGS) usb-driver.c parport.c config.c jtagmon.c $(JTAGKEYSRC) -o $@ -ldl -lusb -lpthread $(FTDI) -shared
 
 lib32:
-	$(MAKE) MARCH=i386 clean all
+	$(MAKE) LIBVER=32 clean all
 
 clean:
 	rm -f $(SOBJECTS)
-- 
2.39.2