--- rpl/src/Makefile.am	2010/08/22 16:38:36	1.36
+++ rpl/src/Makefile.am	2010/08/25 13:44:48	1.37
@@ -357,7 +357,7 @@ generateurs.c: generateurs_aleatoires.aw
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
 	echo COMPILE=$(DEFS) >> $@
-	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
+	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
 	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
@@ -453,10 +453,18 @@ librpl: install-libLIBRARIES
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done
-	(cd $(top_builddir)/librpl && \
-			for i in *.a; do ar x $$i && rm -f $$i; done; \
-			L="start"; \
+	(cd $(top_builddir)/librpl && n=0 && \
 			echo Building standalone librpl.a; \
+			for i in *.a; \
+				do echo Extracting $$i; ar x $$i; \
+				for j in `ar t $$i`; \
+				do cp -f $$j $$n-$$j; \
+					rm -f $$j; \
+				done; \
+				n=`expr $$n + 1`; \
+				rm -f $$i; \
+			done; \
+			L="start"; \
 			while test -n "$$L"; \
 			do \
 				L=""; j=0; \
@@ -480,5 +488,5 @@ librpl: install-libLIBRARIES
 			if [ @OS@ != OS2 ]; then \
 				echo Stripping librpl.a && strip -d librpl.a; \
 			fi;); \
-	mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
+	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a