--- rpl/Makefile.am	2013/03/21 14:13:55	1.67
+++ rpl/Makefile.am	2015/04/17 08:42:19	1.72
@@ -12,7 +12,7 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_
 		rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz
 
 all:
-	@if [ x$(shell $(MAKE) -v | grep "^GNU Make") != x ]; then \
+	@if [ x"$(shell $(MAKE) -v | grep '^GNU Make')" = x ]; then \
 		echo; \
 		echo MAKE=$(MAKE); \
 		echo "Please use GNU Make !"; \
@@ -47,7 +47,8 @@ purge:
 			rm -rf $(top_builddir)/rplcas/$$i; \
 		fi; \
 	done;
-	rm -f $(top_builddir)/tools/openmotif.lib
+	test -f $(top_builddir)/tools/openmotif.lib && \
+			rm -f $(top_builddir)/tools/openmotif.lib
 	rm -rf $(top_builddir)/tools/@OPENSSL@
 	rm -rf $(top_builddir)/tools/@ZLIB@
 
@@ -231,17 +232,13 @@ $(top_builddir)/rplsums/rplmd5sum$(EXEEX
 $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
 	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@UNITS@/units$(EXEEXT) \
-		$(top_builddir)/tools/@UNITS@/units_cur:
+$(top_builddir)/tools/@UNITS@/units$(EXEEXT):
 	if [ @OS@ = OpenBSD ]; then \
 		TMP=tmp.units; \
 		sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
 				@UNITS@/Makefile > $$TMP; \
 		mv -f $$TMP @UNITS@/Makefile; \
 	fi; \
-	if [ x$(srcdir) != x$(top_builddir) ]; then \
-		cp -f $(srcdir)/tools/@UNITS@/units_cur $(top_builddir)/tools/@UNITS@; \
-	fi
 	$(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \