--- rpl/tools/Attic/Makefile.in	2011/09/17 07:33:17	1.61
+++ rpl/tools/Attic/Makefile.in	2011/10/03 15:57:53	1.65
@@ -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,6 +147,7 @@ PROFILAGE = @PROFILAGE@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
 RPLCAS = @RPLCAS@
+RPLTOOLS = @RPLTOOLS@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
@@ -246,7 +247,7 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \
 		@NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \
 		@NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \
-		@NCURSES@-20110910.patch.gz
+		@NCURSES@-20110910.patch.gz openmotif.lib
 
 all: all-am
 
@@ -443,7 +444,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); \
@@ -451,8 +452,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; \