--- rpl/tools/Makefile.am	2012/07/02 12:36:10	1.74
+++ rpl/tools/Makefile.am	2013/02/10 16:29:01	1.84
@@ -3,7 +3,23 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
 		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
 		@NCURSES@-20120616.sh.gz \
-		@NCURSES@-20120622.patch.gz @NCURSES@-20120630.patch.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 @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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
@@ -40,7 +56,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