--- rpl/tools/Makefile.am	2012/02/23 13:00:37	1.58
+++ rpl/tools/Makefile.am	2020/05/21 17:45:03	1.159
@@ -1,56 +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 \
-		openmotif.lib
+		@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:
-	TMP=tmp.tools; \
-	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
-			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
-	mv -f $$TMP @UNITS@/Makefile
-	@list='$(subdirs)'; for subdir in $$list; do \
-		echo "Making $@ in $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			if [ @OS@ = "OS2" ]; then \
-				$(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \
-			else \
-				$(MAKE) -C $$subdir -j1 $@; \
-			fi; \
-		else \
-			if [ $$subdir = @UNITS@ -a @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; \
-			$(MAKE) -C $$subdir $@; \
-		fi; \
-	done;
-	if [ ! -f @OPENSSL@/tests_success ]; then \
-		if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
-			(cd @OPENSSL@ && touch tests_success); \
-		else \
-			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
-		fi; \
-	fi
-	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 \
@@ -59,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
@@ -71,11 +44,15 @@ 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
-	$(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL_DATA) $(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
 	ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1
 	if [ @GNUPLOT_COMPILATION@ ]; then \
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi