--- rpl/tools/Makefile.am	2012/05/14 19:30:02	1.67
+++ rpl/tools/Makefile.am	2012/12/17 21:22:44	1.82
@@ -2,24 +2,24 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@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
+		@NCURSES@-20120616.sh.gz \
+		@NCURSES@-20120622.patch.gz @NCURSES@-20120630.patch.gz \
+		@NCURSES@-20120707.patch.gz @NCURSES@-20120714.patch.gz \
+		@NCURSES@-20120721.patch.gz @NCURSES@-20120728.patch.gz \
+		@NCURSES@-20120804.patch.gz @NCURSES@-20120811.patch.gz \
+		@NCURSES@-20120825.patch.gz @NCURSES@-20120826.patch.gz \
+		@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@-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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
-buildtools = @UNITS@
-
 all:
 	touch openmotif.lib && rm openmotif.lib;
 	if [ x"@BUILD_OPENMOTIF@" = x ]; then \
@@ -30,6 +30,8 @@ all:
 		echo -n LD_MOTIF_ >> openmotif.lib; \
 		grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
 	fi
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -50,7 +52,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