--- rpl/tools/Makefile.am	2010/07/31 10:34:25	1.18
+++ rpl/tools/Makefile.am	2010/08/13 21:02:37	1.22
@@ -1,6 +1,6 @@
 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
+		@FILE@.diff.gz @SQLITE@.tar.gz @SQLITE@.diff.gz @OPENSSL@.tar.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
@@ -9,17 +9,25 @@ all:
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
 	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile | \
 			sed s/-lreadline//g | sed s/-lncurses//g > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
+	mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
+			if [ @OS@ = "OS2" ]; then \
+				$(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \
+			else \
+				$(MAKE) -C $$subdir -j1 $@; \
+			fi; \
 		else \
 			$(MAKE) -C $$subdir $@; \
 		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		fi; \
 	fi
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 			$(top_builddir)/tools/@FILE@/src/*.o \
@@ -34,7 +42,7 @@ clean distclean:
 		fi; \
 	done;
 	if [ -f @OPENSSL@/tests_success ]; then \
-		\rm -f @OPENSSL@/tests_success; \
+		rm -f @OPENSSL@/tests_success; \
 	fi
 
 install: all
@@ -56,7 +64,7 @@ install: all
 			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 uninstall:
-	\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
 			$(DESTDIR)$(datadir)/rplunits \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT) \
 			$(DESTDIR)$(mandir)/man1/gpp.1 \