--- rpl/tools/Makefile.am	2010/03/06 18:29:14	1.6
+++ rpl/tools/Makefile.am	2010/03/27 10:23:34	1.9
@@ -61,6 +61,9 @@ all:
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
+	if [ ! -f @OPENSSL@/tests_success ]; then \
+		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+	fi
 	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
 			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
 	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
@@ -68,8 +71,9 @@ all:
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ @SQLITE@ != $$subdir ]; then $(MAKE) -C $$subdir $@; fi; \
 	done;
+	\rm @OPENSSL@/tests_success
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -86,7 +90,7 @@ install: all
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
-	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
+	$(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile$(EXEEXT) \
 			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
 
 uninstall: