--- rpl/Makefile.am	2013/03/05 23:05:42	1.64
+++ rpl/Makefile.am	2015/04/17 08:42:19	1.72
@@ -4,7 +4,7 @@ SUBDIRS = tools rplsums rpliconv rplawk
 include_HEADERS = rplconfig.h
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
-		COPYING.in lapack/COPYING lapack/RELEASE autogen.sh \
+		HEADER.in lapack/COPYING lapack/RELEASE autogen.sh \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
 		vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \
 		examples/external.tar.gz DEBIAN/control.in \
@@ -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 !"; \
@@ -22,7 +22,7 @@ all:
 	$(MAKE) all-rpl
 
 licences:
-	cp -f $(top_builddir)/COPYING $(srcdir)
+	cp -f $(top_builddir)/HEADER $(srcdir)
 	$(MAKE) -C src $@
 
 purge:
@@ -47,8 +47,10 @@ 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@
 
 $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a:
 	for i in $(shell find tools/@NCURSES@ -name Makefile \
@@ -124,6 +126,9 @@ $(top_builddir)/tools/@READLINE@/libread
 		$(top_builddir)/tools/@READLINE@/libhistory.a:
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
+$(top_builddir)/tools/@ZLIB@/libz.a:
+	$(MAKE) -C $(top_builddir)/tools/@ZLIB@ $(AM_MAKEFLAGS)
+
 $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a:
 # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
 # dans ltmain.sh et propager les modifications dans le script libtool.
@@ -234,9 +239,6 @@ $(top_builddir)/tools/@UNITS@/units$(EXE
 				@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) \
@@ -275,6 +277,7 @@ all-rpl: $(top_builddir)/tools/@NCURSES@
 		$(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
+		$(top_builddir)/tools/@ZLIB@/libz.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \