From 17fdc4c512ec0282db6edca47650a19d088189c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 27 Nov 2011 18:07:41 +0000 Subject: [PATCH] Use $(libdir) to prevent searching 32-bit libraries on 64-bit platforms during linking. --- org.gridsite.core/src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 42db0b0..824bb28 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -352,7 +352,7 @@ gridsite-delegation.cgi: grst-delegation.c delegation.h \ -I$(GRIDSITEDIR)/include \ -DVERSION=\"$(VERSION)\" -L. \ soapC.c soapServer.c \ - -L$(GRIDSITEDIR)/lib $(GSOAP_LIBS) \ + -L$(GRIDSITEDIR)/$(libdir) $(GSOAP_LIBS) \ -lgridsite $(CURL_LIBS) -lz -lssl -lcrypto $(XML2_LIBS) -lm htproxyput: htproxyput.c delegation.h DelegationService.wsdl libgridsite.so.$(VERSION) @@ -375,7 +375,7 @@ gsoap-test: gsoap-test.c -g -DVERSION=\"$(VERSION)\" \ $(GSOAPSSL_CFLAGS) \ -I$(GRIDSITEDIR)/include \ - $(STDSOAP2) -L$(GRIDSITEDIR)/lib \ + $(STDSOAP2) -L$(GRIDSITEDIR)/$(libdir) \ $(GSOAPSSL_LIBS) -lz -lssl -lcrypto $(XML2_LIBS) -lm gridsite-storage.cgi: gridsite-storage.c libgridsite.so.$(VERSION) @@ -384,7 +384,7 @@ gridsite-storage.cgi: gridsite-storage.c libgridsite.so.$(VERSION) -I/usr/kerberos/include -I.\ -I$(GRIDSITEDIR)/include \ -DVERSION=\"$(VERSION)\" -L. \ - -L$(GRIDSITEDIR)/lib \ + -L$(GRIDSITEDIR)/$(libdir) \ -lgridsite $(CURL_CFLAGS) $(CURL_LIBS) -lz -lssl -lcrypto $(XML2_LIBS) -lm clean: -- 1.8.2.3