--- rpl/tools/Attic/Makefile.in	2011/09/20 09:51:43	1.63
+++ rpl/tools/Attic/Makefile.in	2011/10/05 13:14:19	1.67
@@ -37,7 +37,7 @@ target_triplet = @target@
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -147,11 +147,13 @@ PROFILAGE = @PROFILAGE@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
 RPLCAS = @RPLCAS@
+RPLTOOLS = @RPLTOOLS@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
+SHARED_MEMORY = @SHARED_MEMORY@
 SHELL = @SHELL@
 SIGSEGV = @SIGSEGV@
 SQLITE = @SQLITE@
@@ -161,6 +163,8 @@ UNITS = @UNITS@
 VERSION = @VERSION@
 VIM = @VIM@
 VIM_SUPPORT = @VIM_SUPPORT@
+WHOLE_LIB1 = @WHOLE_LIB1@
+WHOLE_LIB2 = @WHOLE_LIB2@
 XMKMF = @XMKMF@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -420,7 +424,7 @@ uninstall-am:
 
 
 all:
-	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	TMP=tmp.tools; \
 	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
 			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
 	mv -f $$TMP @UNITS@/Makefile
@@ -434,7 +438,7 @@ all:
 			fi; \
 		else \
 			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
-				TMP=$$(mktemp tmp.XXXXXXXXXX); \
+				TMP=tmp.units; \
 				sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
 						@UNITS@/Makefile > $$TMP; \
 				mv -f $$TMP @UNITS@/Makefile; \
@@ -443,7 +447,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); \