--- rpl/Makefile.am	2012/04/09 14:01:46	1.45
+++ rpl/Makefile.am	2012/05/14 19:30:02	1.47
@@ -155,7 +155,14 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		} \
 		else \
 		{ \
-			print; \
+			if (index($$0, "CFLAGS") == 1) \
+			{ \
+				printf("CFLAGS = -O2 -g\n"); \
+			} \
+			else \
+			{ \
+				print; \
+			} \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
 	mv -f $$TMP tools/@FILE@/src/Makefile
@@ -170,18 +177,23 @@ $(top_builddir)/tools/@SQLITE@/.libs/@LI
 
 $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
-	if [ @OS@ = "OS2" ]; then \
-		(cd $(top_builddir)/tools/@OPENSSL@ && \
-				sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
-				OS2-EMX.mak | \
-				sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
-				sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
-				sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
-				sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
-				> OS2-EMX.mak2; \
-				$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
-	else \
-		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
+	if [ ! -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' \
+					OS2-EMX.mak | \
+					sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
+					sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
+					sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
+					sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
+					> OS2-EMX.mak2; \
+					$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS); \
+					touch tests_success); \
+		else \
+			(cd $(top_builddir)/tools/@OPENSSL@ && \
+					$(MAKE) -j1 $(AM_MAKEFLAGS); \
+					touch tests_success); \
+		fi \
 	fi
 
 $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
@@ -193,6 +205,12 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@UNITS@/units$(EXEEXT):
+	if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+		TMP=tmp.units; \
+		sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
+				@UNITS@/Makefile > $$TMP; \
+		mv -f $$TMP @UNITS@/Makefile; \
+	fi; \
 	$(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \