$NetBSD: patch-an,v 1.1 2006/02/13 23:20:32 joerg Exp $

--- OS/Makefile-Base.orig	2006-02-12 21:31:59.000000000 +0100
+++ OS/Makefile-Base
@@ -79,7 +79,7 @@ config.h: Makefile buildconfig ../src/co
 # 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 \
         ../util/exigrep ../util/eximstats ../util/exiqsumm \
         ../util/transport-filter.pl ../util/convert4r3 \
         exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \
@@ -207,7 +207,7 @@ OBJ_EXIM = accept.o child.o daemon.o dbf
         route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         store.o string.o tls.o tod.o transport.o tree.o verify.o $(EXIM_PERL)
 
-exim:   libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \
+exim:   libident/libident.a lookups/lookups.a auths/auths.a \
         directors/directors.a routers/routers.a transports/transports.a \
         $(OBJ_EXIM) version.c
 	awk '{ print ($$1+1) }' cnumber.h > cnumber.temp
@@ -215,10 +215,10 @@ exim:   libident/libident.a pcre/libpcre
 	$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
 	/bin/rm -f exim
 	$(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-	  libident/libident.a pcre/libpcre.a directors/directors.a \
+	  libident/libident.a directors/directors.a \
 	  routers/routers.a transports/transports.a lookups/lookups.a \
 	  auths/auths.a \
-	  $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
+	  $(LIBS) -lpcre  $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
 	  $(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then $(STRIP_COMMAND) exim; fi
 	$(EXIM_CHMOD)
@@ -293,12 +293,12 @@ MONBIN = em_StripChart.o $(EXIMON_TEXTPO
 
 OBJ_MONBIN = dummies.o spool_in.o store.o string.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
 	$(CC) -o em_version.o -c \
 	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
 	$(PURIFY) $(CC) -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 $(STRIP_COMMAND) eximon.bin; fi
 	@echo " "