--- rpl/tools/Makefile.am	2012/10/17 14:48:35	1.79
+++ rpl/tools/Makefile.am	2014/05/11 08:22:43	1.111
@@ -1,7 +1,7 @@
 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 \
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz \
 		@NCURSES@-20120616.sh.gz \
 		@NCURSES@-20120622.patch.gz @NCURSES@-20120630.patch.gz \
 		@NCURSES@-20120707.patch.gz @NCURSES@-20120714.patch.gz \
@@ -11,10 +11,48 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@NCURSES@-20120901.patch.gz @NCURSES@-20120902.patch.gz \
 		@NCURSES@-20120903.patch.gz @NCURSES@-20120908.patch.gz \
 		@NCURSES@-20120922.patch.gz @NCURSES@-20121006.patch.gz \
-		@NCURSES@-20121013.patch.gz @NCURSES@-20121017.patch.gz
+		@NCURSES@-20121013.patch.gz @NCURSES@-20121017.patch.gz \
+		@NCURSES@-20121026.patch.gz @NCURSES@-20121102.patch.gz \
+		@NCURSES@-20121110.patch.gz @NCURSES@-20121117.patch.gz \
+		@NCURSES@-20121124.patch.gz @NCURSES@-20121201.patch.gz \
+		@NCURSES@-20121208.patch.gz @NCURSES@-20121215.patch.gz \
+		@NCURSES@-20121222.patch.gz @NCURSES@-20121229.patch.gz \
+		@NCURSES@-20130105.patch.gz @NCURSES@-20130112.patch.gz \
+		@NCURSES@-20130119.patch.gz @NCURSES@-20130126.patch.gz \
+		@NCURSES@-20130202.patch.gz @NCURSES@-20130209.patch.gz \
+		@NCURSES@-20130216.patch.gz @NCURSES@-20130218.patch.gz \
+		@NCURSES@-20130302.patch.gz @NCURSES@-20130309.patch.gz \
+		@NCURSES@-20130316.patch.gz @NCURSES@-20130323.patch.gz \
+		@NCURSES@-20130324.patch.gz @NCURSES@-20130406.patch.gz \
+		@NCURSES@-20130413.patch.gz @NCURSES@-20130427.patch.gz \
+		@NCURSES@-20130504.patch.gz @NCURSES@-20130511.patch.gz \
+		@NCURSES@-20130518.patch.gz @NCURSES@-20130525.patch.gz \
+		@NCURSES@-20130608.patch.gz @NCURSES@-20130615.patch.gz \
+		@NCURSES@-20130622.patch.gz @NCURSES@-20130706.patch.gz \
+		@NCURSES@-20130713.patch.gz @NCURSES@-20130720.patch.gz \
+		@NCURSES@-20130727.patch.gz @NCURSES@-20130805.patch.gz \
+		@NCURSES@-20130816.patch.gz @NCURSES@-20130824.patch.gz \
+		@NCURSES@-20130831.patch.gz @NCURSES@-20130907.patch.gz \
+		@NCURSES@-20130921.patch.gz @NCURSES@-20130928.patch.gz \
+		@NCURSES@-20131005.patch.gz @NCURSES@-20131012.patch.gz \
+		@NCURSES@-20131014.patch.gz @NCURSES@-20131019.patch.gz \
+		@NCURSES@-20131027.patch.gz @NCURSES@-20131102.patch.gz \
+		@NCURSES@-20131110.patch.gz @NCURSES@-20131116.patch.gz \
+		@NCURSES@-20131123.patch.gz @NCURSES@-20131207.patch.gz \
+		@NCURSES@-20131214.patch.gz @NCURSES@-20131221.patch.gz \
+		@NCURSES@-20140118.patch.gz @NCURSES@-20140125.patch.gz \
+		@NCURSES@-20140201.patch.gz @NCURSES@-20140209.patch.gz \
+		@NCURSES@-20140215.patch.gz @NCURSES@-20140222.patch.gz \
+		@NCURSES@-20140301.patch.gz @NCURSES@-20140308.patch.gz \
+		@NCURSES@-20140315.patch.gz @NCURSES@-20140322.patch.gz \
+		@NCURSES@-20140323.patch.gz @NCURSES@-20140329.patch.gz \
+		@NCURSES@-20140412.patch.gz @NCURSES@-20140419.patch.gz \
+		@NCURSES@-20140426.patch.gz @NCURSES@-20140503.patch.gz \
+		@NCURSES@-20140510.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \
+		@ZLIB@
 
 all:
 	touch openmotif.lib && rm openmotif.lib;
@@ -26,7 +64,7 @@ all:
 		echo -n LD_MOTIF_ >> openmotif.lib; \
 		grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
 	fi
-	if [ @GNUPLOT_COMPILATION@ ]; then \
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
@@ -48,7 +86,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