--- exim-4.52/OS/Makefile-Base.orig	2005-07-01 14:09:15 +0300

+++ exim-4.52/OS/Makefile-Base	2005-07-12 15:48:26 +0300

@@ -96,14 +96,14 @@

 # therefore always be run, even if the files exist. This shouldn't in fact be a

 # problem, but it does no harm. Other make programs will just ignore this.

-.PHONY: all allexim buildauths buildlookups buildpcre buildrouters \

+.PHONY: all allexim buildauths buildlookups buildrouters \

         buildtransports checklocalmake clean

 # This is the real default target for all the various exim binaries and

 # scripts, once the configuring stuff is done.

-allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \

+allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \

         exigrep eximstats exipick exiqgrep exiqsumm \

         transport-filter.pl convert4r3 convert4r4 \

         exim_checkaccess \

@@ -314,7 +314,7 @@

         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \

         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)

-exim:   pcre/libpcre.a lookups/lookups.a auths/auths.a \

+exim:   lookups/lookups.a auths/auths.a \

         routers/routers.a transports/transports.a \

         $(OBJ_EXIM) version.c

 	@echo " "

@@ -325,9 +325,8 @@

 	rm -f exim

 	@echo "$(LNCC) -o exim"

 	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \

-	  pcre/libpcre.a \

 	  routers/routers.a transports/transports.a lookups/lookups.a \

-	  auths/auths.a \

+	  auths/auths.a -lpcre \

 	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \

 	  $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \

 	  $(PERL_LIBS) $(TLS_LIBS) $(LDFLAGS)

@@ -429,14 +428,14 @@

 OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)

-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \

+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \

             ../exim_monitor/em_version.c

 	@echo "$(CC) exim_monitor/em_version.c"

 	$(FE)$(CC) -o em_version.o -c \

 	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c

 	@echo "$(LNCC) -o eximon.bin"

 	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \

-	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \

+	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \

 	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc

 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \

 	  echo $(STRIP_COMMAND) eximon.bin; \