--- ./src/global/Makefile.in.orig	2022-08-24 05:15:20 +0000
+++ ./src/global/Makefile.in	2022-08-24 05:15:41 +0000
@@ -157,7 +157,7 @@
 $(LIB):	$(OBJS)
 	$(AR) $(ARFL) $(LIB) $?
 	$(RANLIB) $(LIB)
-	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS)
+	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS) -L$(LIB_DIR) -l$(LIB_PREFIX)util
 
 $(LIB_DIR)/$(LIB): $(LIB)
 	cp $(LIB) $(LIB_DIR)
--- ./src/dns/Makefile.in.orig	2022-08-24 05:18:11 +0000
+++ ./src/dns/Makefile.in	2022-08-24 05:18:39 +0000
@@ -63,7 +63,7 @@
 $(LIB):	$(OBJS)
 	$(AR) $(ARFL) $(LIB) $?
 	$(RANLIB) $(LIB)
-	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS)
+	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS) -L$(LIB_DIR) -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util
 
 $(LIB_DIR)/$(LIB): $(LIB)
 	cp $(LIB) $(LIB_DIR)
--- ./src/tls/Makefile.in.orig	2022-08-24 05:22:50 +0000
+++ ./src/tls/Makefile.in	2022-08-24 05:23:05 +0000
@@ -81,7 +81,7 @@
 $(LIB):	$(OBJS)
 	$(AR) $(ARFL) $(LIB) $?
 	$(RANLIB) $(LIB)
-	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS)
+	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(OBJS) $(SHLIB_SYSLIBS) -L$(LIB_DIR) -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util
 
 $(LIB_DIR)/$(LIB): $(LIB)
 	cp $(LIB) $(LIB_DIR)
--- ./src/master/Makefile.in.orig	2022-08-24 05:43:55 +0000
+++ ./src/master/Makefile.in	2022-08-24 05:44:24 +0000
@@ -44,7 +44,7 @@
 $(LIB):	$(LIB_OBJ)
 	$(AR) $(ARFL) $(LIB) $?
 	$(RANLIB) $(LIB)
-	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(LIB_OBJ) $(SHLIB_SYSLIBS)
+	$(SHLIB_LD) $(SHLIB_RPATH) -o $(LIB) $(LIB_OBJ) $(SHLIB_SYSLIBS) -L$(LIB_DIR) -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util
 
 $(LIB_DIR)/$(LIB): $(LIB)
 	cp $(LIB) $(LIB_DIR)/$(LIB)
--- src/global/Makefile.in.orig	2022-08-24 06:32:12 +0000
+++ src/global/Makefile.in	2022-08-24 06:32:42 +0000
@@ -166,7 +166,7 @@
 plugin_map_so_make: $(PLUGIN_MAP_SO)
 
 $(LIB_PREFIX)ldap$(LIB_SUFFIX): dict_ldap.o
-	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_ldap.o $(AUXLIBS_LDAP)
+	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_ldap.o $(AUXLIBS_LDAP) -L$(LIB_DIR) -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util
 
 $(LIB_PREFIX)mysql$(LIB_SUFFIX): dict_mysql.o
 	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_mysql.o $(AUXLIBS_MYSQL)
--- src/postconf/Makefile.in.orig	2022-08-25 02:04:00 +0000
+++ src/postconf/Makefile.in	2022-08-25 02:05:02 +0000
@@ -33,7 +33,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -lxsasl -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 ../../conf/main.cf.default: $(PROG) Makefile
 	rm -f $@
--- ./src/postalias/Makefile.in.orig	2022-08-30 11:07:49 +0000
+++ ./src/postalias/Makefile.in	2022-08-30 11:08:33 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postcat/Makefile.in.orig	2022-08-30 11:10:04 +0000
+++ ./src/postcat/Makefile.in	2022-08-30 11:10:44 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postdrop/Makefile.in.orig	2022-08-30 11:11:29 +0000
+++ ./src/postdrop/Makefile.in	2022-08-30 11:18:33 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postfix/Makefile.in.orig	2022-08-30 11:21:54 +0000
+++ ./src/postfix/Makefile.in	2022-08-30 11:22:21 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postkick/Makefile.in.orig	2022-08-30 11:22:48 +0000
+++ ./src/postkick/Makefile.in	2022-08-30 11:23:22 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postlock/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postlock/Makefile.in	2022-08-30 11:27:12 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postlog/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postlog/Makefile.in	2022-08-30 11:26:51 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postmap/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postmap/Makefile.in	2022-08-30 11:28:19 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postmulti/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postmulti/Makefile.in	2022-08-30 11:28:55 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postqueue/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postqueue/Makefile.in	2022-08-30 11:29:36 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out postqueue.h
 
--- ./src/postsuper/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/postsuper/Makefile.in	2022-08-30 11:30:11 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/posttls-finger/Makefile.in.orig	2022-08-30 11:25:07 +0000
+++ ./src/posttls-finger/Makefile.in	2022-08-30 11:31:11 +0000
@@ -23,7 +23,7 @@
 	cat ../../conf/makedefs.out $? >$@
 
 posttls-finger: $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 test:	$(TESTPROG)
 
--- ./src/smtpstone/Makefile.in.orig	2022-08-30 11:32:08 +0000
+++ ./src/smtpstone/Makefile.in	2022-08-30 11:33:23 +0000
@@ -21,16 +21,16 @@
 	cat ../../conf/makedefs.out $? >$@
 
 smtp-sink: smtp-sink.o $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ smtp-sink.o -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 smtp-source: smtp-source.o $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ smtp-source.o $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ smtp-source.o -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 qmqp-sink: qmqp-sink.o $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ qmqp-sink.o $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ qmqp-sink.o -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 qmqp-source: qmqp-source.o $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ qmqp-source.o $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ qmqp-source.o -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 test:	$(TESTPROG)
 
--- ./src/sendmail/Makefile.in.orig	2022-08-30 11:39:38 +0000
+++ ./src/sendmail/Makefile.in	2022-08-30 11:40:09 +0000
@@ -14,7 +14,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/anvil/Makefile.in.orig	2022-08-31 01:03:54 +0000
+++ ./src/anvil/Makefile.in	2022-08-31 01:04:47 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/bounce/Makefile.in.orig	2022-08-31 01:05:28 +0000
+++ ./src/bounce/Makefile.in	2022-08-31 01:06:04 +0000
@@ -24,7 +24,7 @@
 all:	$(PROG) ../../conf/bounce.cf.default
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 # Eliminate dependency on installed Postfix.
 ../../conf/bounce.cf.default: template_test.ref annotate.sh
--- ./src/cleanup/Makefile.in.orig	2022-08-31 01:06:38 +0000
+++ ./src/cleanup/Makefile.in	2022-08-31 01:07:35 +0000
@@ -26,7 +26,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -lmilter -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/discard/Makefile.in.orig	2022-08-31 01:08:24 +0000
+++ ./src/discard/Makefile.in	2022-08-31 01:08:57 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/dnsblog/Makefile.in.orig	2022-08-31 01:09:24 +0000
+++ ./src/dnsblog/Makefile.in	2022-08-31 01:10:06 +0000
@@ -16,7 +16,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/error/Makefile.in.orig	2022-08-31 01:10:36 +0000
+++ ./src/error/Makefile.in	2022-08-31 01:11:09 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/flush/Makefile.in.orig	2022-08-31 01:11:40 +0000
+++ ./src/flush/Makefile.in	2022-08-31 01:12:15 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/smtp/Makefile.in.orig	2022-08-31 01:16:15 +0000
+++ ./src/smtp/Makefile.in	2022-08-31 01:17:29 +0000
@@ -24,7 +24,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -lxsasl -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/local/Makefile.in.orig	2022-08-31 01:18:40 +0000
+++ ./src/local/Makefile.in	2022-08-31 01:19:12 +0000
@@ -21,7 +21,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/master/Makefile.in.orig	2022-08-31 01:20:22 +0000
+++ ./src/master/Makefile.in	2022-08-31 01:21:05 +0000
@@ -34,7 +34,7 @@
 	cat ../../conf/makedefs.out $? >$@
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L$(LIB_DIR) -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 test:	$(TESTPROG)
 
--- ./src/oqmgr/Makefile.in.orig	2022-08-31 01:21:38 +0000
+++ ./src/oqmgr/Makefile.in	2022-08-31 01:22:26 +0000
@@ -21,7 +21,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/pickup/Makefile.in.orig	2022-08-31 01:23:00 +0000
+++ ./src/pickup/Makefile.in	2022-08-31 01:23:32 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/pipe/Makefile.in.orig	2022-08-31 01:29:46 +0000
+++ ./src/pipe/Makefile.in	2022-08-31 01:30:19 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postscreen/Makefile.in.orig	2022-08-31 01:33:12 +0000
+++ ./src/postscreen/Makefile.in	2022-08-31 01:34:01 +0000
@@ -25,7 +25,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/proxymap/Makefile.in.orig	2022-08-31 01:34:40 +0000
+++ ./src/proxymap/Makefile.in	2022-08-31 01:35:12 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/qmgr/Makefile.in.orig	2022-08-31 01:35:48 +0000
+++ ./src/qmgr/Makefile.in	2022-08-31 01:36:25 +0000
@@ -23,7 +23,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/qmqpd/Makefile.in.orig	2022-08-31 01:36:53 +0000
+++ ./src/qmqpd/Makefile.in	2022-08-31 01:37:24 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/scache/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/scache/Makefile.in	2022-08-31 02:02:41 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/showq/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/showq/Makefile.in	2022-08-31 02:03:24 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/smtpd/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/smtpd/Makefile.in	2022-08-31 02:04:27 +0000
@@ -27,7 +27,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)tls -lxsasl -lmilter -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/spawn/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/spawn/Makefile.in	2022-08-31 02:05:27 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/tlsmgr/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/tlsmgr/Makefile.in	2022-08-31 02:06:20 +0000
@@ -17,7 +17,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/tlsproxy/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/tlsproxy/Makefile.in	2022-08-31 02:07:12 +0000
@@ -17,7 +17,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)tls -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/trivial-rewrite/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/trivial-rewrite/Makefile.in	2022-08-31 02:12:26 +0000
@@ -20,7 +20,7 @@
 all:	$(PROG) $(LIB)
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/verify/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/verify/Makefile.in	2022-08-31 02:12:58 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/virtual/Makefile.in.orig	2022-08-31 02:01:38 +0000
+++ ./src/virtual/Makefile.in	2022-08-31 02:13:36 +0000
@@ -15,7 +15,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/postlogd/Makefile.in.orig	2022-08-31 04:12:26 +0000
+++ ./src/postlogd/Makefile.in	2022-08-31 04:13:11 +0000
@@ -16,7 +16,7 @@
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) $(SHLIB_RPATH) -o $@ $(OBJS) -L../../lib -l$(LIB_PREFIX)dns -l$(LIB_PREFIX)master -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util $(SYSLIBS)
 
 $(OBJS): ../../conf/makedefs.out
 
--- ./src/util/Makefile.in.orig	2026-01-25 11:24:05.029860042 -0600
+++ ./src/util/Makefile.in	2026-01-25 11:24:59.058796680 -0600
@@ -181,7 +181,7 @@
 plugin_map_so_make: $(PLUGIN_MAP_SO)
 
 $(LIB_PREFIX)pcre$(LIB_SUFFIX): dict_pcre.o
-	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_pcre.o $(AUXLIBS_PCRE)
+	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_pcre.o $(AUXLIBS_PCRE) -L$(LIB_DIR) -l$(LIB_PREFIX)util
 
 $(LIB_PREFIX)cdb$(LIB_SUFFIX): mkmap_cdb.o dict_cdb.o
 	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ mkmap_cdb.o \
--- ./src/global/Makefile.in.orig	2026-01-25 11:25:39.426713161 -0600
+++ ./src/global/Makefile.in	2026-01-25 11:26:10.638892974 -0600
@@ -172,7 +172,7 @@
 	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_pgsql.o $(AUXLIBS_PGSQL)
 
 $(LIB_PREFIX)sqlite$(LIB_SUFFIX): dict_sqlite.o
-	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_sqlite.o $(AUXLIBS_SQLITE)
+	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_sqlite.o $(AUXLIBS_SQLITE) -L$(LIB_DIR) -l$(LIB_PREFIX)global -l$(LIB_PREFIX)util
 
 $(LIB_PREFIX)mongodb$(LIB_SUFFIX): dict_mongodb.o
 	$(PLUGIN_LD) $(SHLIB_RPATH) -o $@ dict_mongodb.o $(AUXLIBS_MONGODB)
