--- rpl/Makefile.am	2017/08/03 18:51:51	1.84
+++ rpl/Makefile.am	2019/07/16 15:17:15	1.88
@@ -34,7 +34,7 @@ purge:
 		rm -rf $(srcdir)/tools/$$i; \
 		rm -rf $(top_builddir)/tools/$$i; \
 	done;
-	for i in @GMP@ @MPFR@ @NTL@ @COCOA@ @PARI@ @GIAC@ @FLTK@; \
+	for i in @GMP@ @MPFR@ @MPFI@ @NTL@ @COCOA@ @PARI@ @GIAC@ @FLTK@; \
 	do \
 		if [ -d $(srcdir)/rplcas/$$i ]; then \
 			rm -rf $(srcdir)/rplcas/$$i; \
@@ -326,9 +326,9 @@ debian: all
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/lib
 	cp -f $(top_builddir)/src/librpl.a $(top_builddir)/debian/$(prefix)/lib
-	for i in sets motifs; \
+	for i in sets motif; \
 	do \
-		cp -f $(top_builddir)/modules/$i/$i.rplso \
+		cp -f $(top_builddir)/modules/$$i/$$i.rplso \
 				$(top_builddir)/debian/$(prefix)/lib; \
 	done
 	for j in man man/fr_FR; \
@@ -348,6 +348,7 @@ debian: all
 		done; \
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
+	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec
 	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
 			$(top_builddir)/debian/$(prefix)/share/rplfiles.mgc
 	cp -f $(srcdir)/tools/@UNITS@/definitions.units \
@@ -356,39 +357,19 @@ debian: all
 			$(top_builddir)/debian/$(prefix)/share/rplunits.tmp \
 			> $(top_builddir)/debian/$(prefix)/share/rplunits
 	rm -f $(top_builddir)/debian/$(prefix)/share/rplunits.tmp
-	if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \
-		if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
-			mv -f $(prefix)/bin/gnuplot$(EXEEXT) \
-					$(prefix)/bin/gnuplot$(EXEEXT).orig; \
-			mv -f $(prefix)/share/gnuplot $(prefix)/share/gnuplot.orig; \
-			mv -f $(prefix)/libexec/gnuplot $(prefix)/libexec/gnuplot.orig; \
-			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) install); \
-			cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
-					$(top_builddir)/debian/$(prefix)/bin; \
-			cp -af $(prefix)/share/gnuplot \
-					$(top_builddir)/debian/$(prefix)/share; \
-			$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec; \
-			cp -af $(prefix)/libexec/gnuplot \
-					$(top_builddir)/debian/$(prefix)/libexec; \
-			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) uninstall); \
-			rm -f $(prefix)/bin/gnuplot$(EXEEXT); \
-			rm -rf $(prefix)/share/gnuplot; \
-			rm -rf $(prefix)/libexec/gnuplot; \
-			mv $(prefix)/bin/gnuplot$(EXEEXT).orig \
-					$(prefix)/bin/gnuplot$(EXEEXT); \
-			mv -f $(prefix)/share/gnuplot.orig $(prefix)/share/gnuplot; \
-			mv -f $(prefix)/libexec/gnuplot.orig $(prefix)/libexec/gnuplot; \
-		else \
-			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) install); \
-			cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
-					$(top_builddir)/debian/$(prefix)/bin; \
-			cp -af $(prefix)/share/gnuplot \
-					$(top_builddir)/debian/$(prefix)/share; \
-			$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec; \
-			cp -af $(prefix)/libexec/gnuplot \
-					$(top_builddir)/debian/$(prefix)/libexec; \
-			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) uninstall); \
-		fi; \
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
+		(cd $(top_builddir)/tools/@GNUPLOT@ && \
+				$(MAKE) prefix=./install install); \
+		cp -arf $(top_builddir)/tools/@GNUPLOT@/term/install/share/* \
+				$(top_builddir)/debian/$(prefix)/share; \
+		cp -arf $(top_builddir)/tools/@GNUPLOT@/share/install/share/* \
+				$(top_builddir)/debian/$(prefix)/share; \
+		cp -arf $(top_builddir)/tools/@GNUPLOT@/src/install/bin/* \
+				$(top_builddir)/debian/$(prefix)/bin; \
+		cp -arf $(top_builddir)/tools/@GNUPLOT@/src/install/libexec/* \
+				$(top_builddir)/debian/$(prefix)/libexec; \
+		(cd $(top_builddir)/tools/@GNUPLOT@ && \
+				$(MAKE) prefix=./install uninstall); \
 	fi
 	$(MKDIR_P) $(top_builddir)/debian/DEBIAN
 	cp -f $(top_builddir)/DEBIAN/* $(top_builddir)/debian/DEBIAN