--- rpl/Makefile.am	2010/08/06 15:32:16	1.15
+++ rpl/Makefile.am	2010/08/09 13:52:11	1.16
@@ -104,16 +104,13 @@ $(top_builddir)/tools/@READLINE@/libread
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.a:
-	if [ @OS@ = "OS2" ]; then \
-		mkdir $(top_builddir)/tools/@GSL@/.libs; \
-		for i in `grep ^SUBDIRS $(top_builddir)/tools/@GSL@/Makefile`; \
-		do \
-			(cd $(top_builddir)/tools/@GSL@/$$i && $(MAKE) $(AM_MAKEFLAGS) \
-					&& if [ -d .libs ]; then cd .libs && \
-					ar -cru ../../.libs/libgsl.a *.o; fi;); \
-		done; \
-	else \
-		(cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS)); \
+	if [ @OS@ == "OS2" ]; then \
+		(cp $(top_builddir)/tools/@GSL@ && ./configure --disable-shared); \
+	fi
+	$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)
+	if [ @OS@ == "OS2" ]; then \
+		\cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
+				$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \
 	fi
 
 $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
@@ -193,12 +190,7 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt
 	fi
 
 $(top_builddir)/ptmalloc3/libptmalloc3.a :
-	if [ @OS@ = "OS2" ]; then \
-		echo "unavailable for OS2" \
-				> $(top_builddir)/ptmalloc3/libptmalloc3.a; \
-	else \
-		$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS); \
-	fi
+	$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \