--- rpl/src/Makefile.am	2010/08/09 13:51:47	1.31
+++ rpl/src/Makefile.am	2010/08/12 14:13:57	1.33
@@ -416,7 +416,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
-		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @SEMUN@ \
+		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
@@ -443,7 +443,7 @@ install-exec-local: librpl
 
 librpl: install-libLIBRARIES
 	if [ -d $(top_builddir)/librpl ]; then \
-		\rm -rf $(top_builddir)/librpl; \
+		rm -rf $(top_builddir)/librpl; \
 	fi
 	mkdir -p $(top_builddir)/librpl; \
 	for i in $(top_builddir)/src/librpl.a \
@@ -454,10 +454,17 @@ librpl: install-libLIBRARIES
 			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
 			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \
 	do \
-		\cp -f $$i $(top_builddir)/librpl; \
+		cp -f $$i $(top_builddir)/librpl; \
 	done
-	(cd $(top_builddir)/librpl && \
-			for i in *.a; do ar x $$i && \rm -f $$i; done; \
-			ar crs librpl.a *.$(OBJEXT);); \
-	\mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
+	if [ @OS@ = OS2 ]; then \
+		(cd $(top_builddir)/librpl && \
+				for i in *.a; do ar x $$i && rm -f $$i; done && \
+				for i in *.$(OBJEXT); do ar cru librpl.a $$i; done && \
+				ar s librpl.a;); \
+	else \
+		(cd $(top_builddir)/librpl && \
+				for i in *.a; do ar x $$i && rm -f $$i; done; \
+				ar crs librpl.a *.$(OBJEXT);); \
+	fi
+	mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a