--- rpl/tools/Makefile.am	2012/05/14 19:34:41	1.68
+++ rpl/tools/Makefile.am	2019/07/18 08:10:16	1.158
@@ -1,33 +1,26 @@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@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@-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 \
-		@NCURSES@-20120428.patch.gz	@NCURSES@-20120505.patch.gz \
-		@NCURSES@-20120512.patch.gz
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @BUILD_SIGSEGV@ @BUILD_OPENMOTIF@ \
+		@ZLIB@
 
 all:
-	touch openmotif.lib && rm openmotif.lib;
+	test -f openmotif.lib && rm -f openmotif.lib;
 	if [ x"@BUILD_OPENMOTIF@" = x ]; then \
 		touch openmotif.lib; \
 	else \
 		echo -n LD_MOTIF_ > openmotif.lib; \
-		grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+		grep "^LIBS=" @OPENMOTIF@/config.log | \
+				tr -d "'" >> openmotif.lib; \
 		echo -n LD_MOTIF_ >> openmotif.lib; \
-		grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+		grep "^X_XMU" @OPENMOTIF@/config.log | \
+				tr -d "'" >> openmotif.lib; \
 	fi
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -36,6 +29,9 @@ clean distclean:
 			$(MAKE) -C $$subdir $@; \
 		fi; \
 	done;
+	if [ -d @OPENMOTIF@/install ]; then \
+		rm -rf @OPENMOTIF@/install; \
+	fi
 	if [ -f @OPENSSL@/tests_success ]; then \
 		rm -f @OPENSSL@/tests_success; \
 	fi
@@ -48,7 +44,11 @@ install: all
 	$(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \
 			$(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	$(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits
+	$(INSTALL_DATA) $(srcdir)/$(UNITS)/definitions.units \
+			$(DESTDIR)$(datadir)/rplunits.tmp
+	sed 's/^!include currency.units//g' $(DESTDIR)$(datadir)/rplunits.tmp \
+			> $(DESTDIR)$(datadir)/rplunits
+	rm -f $(DESTDIR)$(datadir)/rplunits.tmp
 	$(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1