From ff48c0d9098080b51ea12710029135916d117806 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 30 Mar 2010 12:36:28 +0000
Subject: svn merge -r514:HEAD ^/branches/released .

---
 openssl/crypto/jpake/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl/crypto/jpake/Makefile')

diff --git a/openssl/crypto/jpake/Makefile b/openssl/crypto/jpake/Makefile
index a4a1402f2..110c49ce0 100644
--- a/openssl/crypto/jpake/Makefile
+++ b/openssl/crypto/jpake/Makefile
@@ -16,7 +16,7 @@ top:
 all:	lib
 
 lib:	$(LIBOBJ)
-	$(ARX) $(LIB) $(LIBOBJ)
+	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
-- 
cgit v1.2.3