--- rpl/tools/Makefile.am	2011/10/03 15:57:53	1.50
+++ rpl/tools/Makefile.am	2012/04/23 08:31:02	1.65
@@ -2,23 +2,22 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
 		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
-		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
-		@NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
-		@NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
-		@NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \
-		@NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \
-		@NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \
-		@NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \
-		@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@-20111224.sh.gz \
+		@NCURSES@-20111231.patch.gz @NCURSES@-20120107.patch.gz \
+		@NCURSES@-20120114.patch.gz @NCURSES@-20120121.patch.gz \
+		@NCURSES@-20120128.patch.gz @NCURSES@-20120204.patch.gz \
+		@NCURSES@-20120211.patch.gz @NCURSES@-20120218.patch.gz \
+		@NCURSES@-20120225.patch.gz @NCURSES@-20120228.patch.gz \
+		@NCURSES@-20120303.patch.gz @NCURSES@-20120310.patch.gz \
+		@NCURSES@-20120317.patch.gz @NCURSES@-20120324.patch.gz \
+		@NCURSES@-20120331.patch.gz @NCURSES@-20120407.patch.gz \
+		@NCURSES@-20120414.patch.gz	@NCURSES@-20120421.patch.gz
 
 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 +31,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; \
@@ -48,7 +47,7 @@ all:
 		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 +66,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)