--- rpl/Makefile.am	2012/08/22 09:29:49	1.55
+++ rpl/Makefile.am	2013/02/10 16:21:44	1.59
@@ -17,14 +17,16 @@ licences:
 
 toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@ @SQLITE@; \
+			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
 	do \
 		rm -rf $(srcdir)/tools/$$i; \
 	done;
+	rm -f $(top_builddir)/tools/openmotif.lib
+	rm -rf $(top_builddir)/tools/@OPENSSL@
 
 toolsclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@ @SQLITE@; \
+			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
 	do \
 		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
 	done;
@@ -213,6 +215,7 @@ $(top_builddir)/tools/@UNITS@/units$(EXE
 				@UNITS@/Makefile > $$TMP; \
 		mv -f $$TMP @UNITS@/Makefile; \
 	fi; \
+	cp -f $(srcdir)/tools/@UNITS@/units_cur $(top_builddir)/tools/@UNITS@
 	$(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
@@ -315,8 +318,12 @@ debian: all
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
 	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
 			$(top_builddir)/debian/$(prefix)/share/rplfiles.mgc
-	cp -f $(srcdir)/tools/@UNITS@/units.dat \
-			$(top_builddir)/debian/$(prefix)/share
+	cp -f $(srcdir)/tools/@UNITS@/definitions.units \
+			$(top_builddir)/debian/$(prefix)/share/rplunits.tmp
+	sed 's/^!include currency.units//g' \
+			$(top_builddir)/debian/$(prefix)/share/rplunits.tmp \
+			> $(top_builddir)/debian/$(prefix)/share/rplunits
+	rm -f $(top_builddir)/debian/$(prefix)/share/rplunits.tmp
 	if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \
 		if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
 			mv -f $(prefix)/bin/gnuplot$(EXEEXT) \