--- rpl/tools/Makefile.am	2011/09/17 07:33:17	1.48
+++ rpl/tools/Makefile.am	2011/10/03 15:57:53	1.50
@@ -41,7 +41,7 @@ all:
 		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		if [ @OS@ = "OS2" ]; then \
+		if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
 			(cd @OPENSSL@ && touch tests_success); \
 		else \
 			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
@@ -49,8 +49,7 @@ all:
 	fi
 	touch openmotif.lib && rm openmotif.lib;
 	if [ x@BUILD_OPENMOTIF@ = x ]; then \
-		echo LD_MOTIF_ > openmotif.lib; \
-		echo LD_MOTIF_ >> openmotif.lib; \
+		touch openmotif.lib; \
 	else \
 		echo -n LD_MOTIF_ > openmotif.lib; \
 		grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \