--- rpl/Makefile.am	2012/05/28 11:16:08	1.48
+++ rpl/Makefile.am	2012/05/29 13:34:17	1.49
@@ -146,7 +146,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		{ \
 			if (index($$0, "-static") == 0) \
 			{ \
-				printf("%s -static\n", $$0); \
+				printf("%s -static @ABI@\n", $$0); \
 			} \
 			else \
 			{ \
@@ -157,7 +157,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		{ \
 			if (index($$0, "CFLAGS") == 1) \
 			{ \
-				printf("CFLAGS = -O2 -g\n"); \
+				printf("CFLAGS = -O2 -g @ABI@\n"); \
 			} \
 			else \
 			{ \
@@ -168,7 +168,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/*.o \
+			@CFLAGS@ $(top_builddir)/tools/@FILE@/src/*.o \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
 
@@ -177,7 +177,9 @@ $(top_builddir)/tools/@SQLITE@/.libs/@LI
 
 $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
-	if [ ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
+	if [ ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
 		if [ @OS@ = "OS2" ]; then \
 			(cd $(top_builddir)/tools/@OPENSSL@ && \
 					sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \