--- Makefile.in.orig	Mon Sep 12 10:45:39 2005
+++ Makefile.in	Thu Dec 22 17:27:13 2005
@@ -198,18 +198,18 @@ pcre_stringpiece_unittest@EXEEXT@: libpc
 
 libpcre.la:     $(OBJ)
 		-rm -f libpcre.la
-		$(LINKLIB) -rpath $(LIBDIR) -version-info \
-		'$(PCRELIBVERSION)' -o libpcre.la $(LOBJ)
+		$(LINKLIB) -rpath $(LIBDIR) $(libpcre_la_LDFLAGS) \
+		-o libpcre.la $(LOBJ)
 
 libpcreposix.la: libpcre.la pcreposix.@OBJEXT@
 		-rm -f libpcreposix.la
-		$(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \
-		'$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo
+		$(LINKLIB) -rpath $(LIBDIR) libpcre.la $(libpcreposix_la_LDFLAGS) \
+		-o libpcreposix.la pcreposix.lo
 
 libpcrecpp.la: libpcre.la $(CPPOBJ)
 		-rm -f libpcrecpp.la
-		$(CXXLINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \
-		'$(PCRECPPLIBVERSION)' -o libpcrecpp.la $(CPPLOBJ)
+		$(CXXLINKLIB) -rpath $(LIBDIR) libpcre.la $(libpcrecpp_la_LDFLAGS) \
+		-o libpcrecpp.la $(CPPLOBJ)
 
 # Note that files generated by ./configure and by dftables are in the current
 # directory, not the source directory.
@@ -438,7 +438,6 @@ install:        all @ON_WINDOWS@ wininst
 @NOT_ON_WINDOWS@	       $(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la
 @NOT_ON_WINDOWS@@HAVE_CPP@		echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la"
 @NOT_ON_WINDOWS@@HAVE_CPP@		$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la
-@NOT_ON_WINDOWS@	       $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR)
 		$(mkinstalldirs) $(DESTDIR)$(INCDIR)
 		$(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h
 		$(INSTALL_DATA) $(top_srcdir)/pcreposix.h $(DESTDIR)$(INCDIR)/pcreposix.h
@@ -479,8 +478,8 @@ install:        all @ON_WINDOWS@ wininst
 		$(INSTALL_DATA) $(top_srcdir)/doc/pcregrep.1 $(DESTDIR)$(MANDIR)/man1/pcregrep.1
 		$(INSTALL_DATA) $(top_srcdir)/doc/pcretest.1 $(DESTDIR)$(MANDIR)/man1/pcretest.1
 		$(mkinstalldirs) $(DESTDIR)$(BINDIR)
-		$(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
-		$(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
+		$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP) pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
+		$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP) pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
 		$(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
 		$(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
 		$(INSTALL_DATA) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
