--- rpl/Makefile.am	2016/10/11 09:27:46	1.77
+++ rpl/Makefile.am	2017/10/11 16:15:54	1.85
@@ -1,5 +1,5 @@
 SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \
-		rpltags scripts man doc
+		rpltags scripts man doc modules/sets @MODULE_MOTIF@
 
 include_HEADERS = rplconfig.h
 
@@ -262,9 +262,11 @@ $(top_builddir)/rplcas/lib/librplcas.a:
 		$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
 	$(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@OPENMOTIF@/lib/Xm/.libs/libXm.a: \
+$(top_builddir)/tools/@OPENMOTIF@/install/lib/libXm.a : \
 		$(top_builddir)/tools/@LIBXPM@/src/.libs/libXpm.a
 	$(MAKE) -C $(top_builddir)/tools/@OPENMOTIF@ -j1
+	$(MAKE) -C $(top_builddir)/tools/@OPENMOTIF@ -j1 \
+			prefix=$(abs_top_builddir)/tools/@OPENMOTIF@/install install
 
 $(top_builddir)/tools/@LIBXPM@/src/.libs/libXpm.a:
 	$(MAKE) -C $(top_builddir)/tools/@LIBXPM@ $(AM_MAKEFLAGS)
@@ -295,6 +297,10 @@ all-rpl: $(top_builddir)/tools/@NCURSES@
 	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
+	$(MAKE) -C $(top_builddir)/modules/sets $(AM_MAKEFLAGS)
+	if [ x"@BUILD_OPENMOTIF@" != x ]; then \
+		$(MAKE) -C $(top_builddir)/modules/motif $(AM_MAKEFLAGS); \
+	fi
 
 debian: all
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) librpl
@@ -320,6 +326,11 @@ 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 motif; \
+	do \
+		cp -f $(top_builddir)/modules/$$i/$$i.rplso \
+				$(top_builddir)/debian/$(prefix)/lib; \
+	done
 	for j in man man/fr_FR; \
 	do \
 		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/$$j/man1; \
@@ -337,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 \
@@ -345,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