--- Makefile.in.orig	Wed Feb  9 10:44:58 2000
+++ Makefile.in	Thu Mar  9 22:32:11 2000
@@ -42,7 +42,7 @@
 # is set to "la" instead of "a", which causes the shared libraries to be
 # installed.
 
-LIBTOOL = @LIBTOOL@
+LIBTOOL = $(LOCALBASE)/bin/libtool
 LIBSUFFIX = @LIBSUFFIX@
 
 # These are the version numbers for the shared libraries
@@ -76,13 +76,7 @@
 OBJ = maketables.o get.o study.o pcre.o
 LOBJ = maketables.lo get.lo study.lo pcre.lo
 
-all:            libtool libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest pgrep
-
-libtool:        config.guess config.sub ltconfig ltmain.sh
-		@if test "$(LIBTOOL)" = "libtool"; then \
-		  echo '--- Building libtool ---'; \
-		  ./ltconfig ./ltmain.sh; \
-		  echo '--- Built libtool ---'; fi
+all:            libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest pgrep
 
 pgrep:          libpcre.$(LIBSUFFIX) pgrep.o
 		  @echo ' '
@@ -110,7 +104,7 @@
 		@echo '--- Building shared library: libpcre'
 		@echo ' '
 		-rm -f libpcre.la
-		libtool $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ)
+		$(LIBTOOL) $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ)
 
 libpcreposix.a: pcreposix.o
 		@echo ' '
@@ -125,7 +119,7 @@
 		@echo '--- Building shared library: libpcreposix'
 		@echo ' '
 		-rm -f libpcreposix.la
-		libtool $(CC) -version-info '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la -rpath $(LIBDIR) pcreposix.lo
+		$(LIBTOOL) $(CC) -version-info '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la -rpath $(LIBDIR) pcreposix.lo
 
 pcre.o:         chartables.c pcre.c pcre.h internal.h config.h Makefile
 		$(LIBTOOL) $(CC) -c $(CFLAGS) pcre.c