--- rpl/tools/Makefile.am	2011/09/17 18:42:14	1.49
+++ rpl/tools/Makefile.am	2011/11/28 20:28:55	1.56
@@ -12,13 +12,19 @@ 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 openmotif.lib
+		@NCURSES@-20110910.patch.gz @NCURSES@-20110917.patch.gz \
+		@NCURSES@-20110924.patch.gz @NCURSES@-20110925.patch.gz \
+		@NCURSES@-20111001.patch.gz @NCURSES@-20111008.patch.gz \
+		@NCURSES@-20111015.patch.gz @NCURSES@-20111022.patch.gz \
+		@NCURSES@-20111030.patch.gz @NCURSES@-20111112.patch.gz \
+		@NCURSES@-20111119.patch.gz @NCURSES@-20111126.patch.gz \
+		openmotif.lib
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 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
@@ -32,7 +38,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; \
@@ -41,14 +47,14 @@ 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); \
 		fi; \
 	fi
 	touch openmotif.lib && rm openmotif.lib;
-	if [ x@BUILD_OPENMOTIF@ = x ]; then \
+	if [ x"@BUILD_OPENMOTIF@" = x ]; then \
 		touch openmotif.lib; \
 	else \
 		echo -n LD_MOTIF_ > openmotif.lib; \
@@ -67,6 +73,9 @@ clean distclean:
 	if [ -f @OPENSSL@/tests_success ]; then \
 		rm -f @OPENSSL@/tests_success; \
 	fi
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplpp$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)