--- util/Makefile.orig	Tue Jul 12 18:45:55 2005
+++ util/Makefile	Fri Mar  9 12:47:33 2007
@@ -35,13 +35,14 @@
 LOCAL_SRC=addr.c field.c parse.c ascii.c string.c match.c list.c log.c config.c alloc.c hash.c pwcache.c sysdep.c
 LOCAL_OBJ=addr.o field.o parse.o ascii.o string.o match.o list.o log.o config.o alloc.o hash.o pwcache.o sysdep.o
 LOCAL_LIB=libsmail.a
-SH_TARGETS=checkerr cyrus-deliver-noquota getmap init logsumm mkaliases mkcyrusoqlist mkpath \
+SH_TARGETS=checkerr getmap init logsumm mkaliases mkpath \
 	   mkuuwho mkhpath bouncemail savelog smailbug unfreezemail
 C_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
 UTIL_TARGETS=${SH_TARGETS} ${C_TARGETS}
 # this may not always be sane or necessary....
-BIN_TARGETS=bouncemail cyrus-deliver-noquota mkaliases mkcyrusoqlist smailbug unfreezemail
-TARGETS=${UTIL_TARGETS} ${BIN_TARGETS}
+BIN_TARGETS=bouncemail mkaliases smailbug unfreezemail
+CYRUS_BIN_TARGETS=cyrus-deliver-noquota mkcyrusoqlist
+TARGETS=${UTIL_TARGETS} ${BIN_TARGETS} ${CYRUS_BIN_TARGETS}
 STRIP_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
 OBJ=mkline.o mksort.o dcasehost.o mkdbm.o pathmerge.o \
     gleem.o unsharmap.o
@@ -110,6 +111,21 @@
 			fi; \
 		done; \
 	   esac
+
+install-cyrus-bins: all
+	@. ./${DEFS_SH}; \
+	   case "$$DONT_INSTALL" in \
+	   ?*)	echo Testing ... install ignored; exit 0;; \
+	   esac; \
+	   ${XEXEC} ${SHELL} ${INSTM} -m 0555 $$UTIL_BIN_DIR ${CYRUS_BIN_TARGETS}; \
+	   for i in ${CYRUS_BIN_TARGETS} ; do \
+		case $$UTIL_BIN_DIR in \
+		"$$SMAIL_BIN_DIR")	xx="";; \
+		*)			xx=$$SMAIL_BIN_DIR/$$i;; \
+		esac; \
+		${XEXEC} ${SHELL} ${INST} -m 0555 $$l_flag -d $$UTIL_BIN_DIR $$i $$i $$xx; \
+	   done; \
+
 
 install-libs: ${DEFS_SH}
 	@. ./${DEFS_SH}; \