diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4 dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4
--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4	2006-10-06 08:44:44.000000000 +0300
+++ dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4	2009-07-19 09:52:08.000000000 +0300
@@ -26,7 +26,7 @@
 CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
 # Linker for libraries
 LD=	ifdef(`confLD', `confLD', `confCC')
-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
+LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
 LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
 
 # Shell
@@ -71,7 +71,7 @@
 LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') 
 
 # libraries required on your system
-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') 
+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')  ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
 
 # location of sendmail binary (usually /usr/sbin or /usr/lib)
 BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4 dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4
--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4	2006-10-06 08:44:44.000000000 +0300
+++ dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4	2009-07-19 09:51:59.000000000 +0300
@@ -30,12 +30,12 @@
 
 ifdef(`bldNO_INSTALL', ,
 `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
-	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
-	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
+	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
 ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
 
 strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
-	${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
+	${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
 
 bldCURRENT_PRODUCT-clean:
 	rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4 dkim-milter-2.8.3/devtools/M4/UNIX/library.m4
--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4	2006-09-06 01:56:53.000000000 +0300
+++ dkim-milter-2.8.3/devtools/M4/UNIX/library.m4	2009-07-19 09:51:59.000000000 +0300
@@ -27,8 +27,8 @@
 ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 
 install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
-ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
 
 bldCURRENT_PRODUCT-clean:
 	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4 dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4
--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4	2006-09-08 01:13:07.000000000 +0300
+++ dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4	2009-07-19 09:51:59.000000000 +0300
@@ -68,11 +68,11 @@
 ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
 define(`bldMAN_INSTALL_CMD', 
 `ifdef(`confDONT_INSTALL_CATMAN', `dnl', 
-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
 ifdef(`confINSTALL_RAWMAN', 
-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
 )dnl
 bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
 ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4 dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4
--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4	2009-01-22 04:18:32.000000000 +0200
+++ dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4	2009-07-19 09:51:59.000000000 +0300
@@ -53,10 +53,10 @@
 ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 
 install-`'bldCURRENT_PRODUCT: ${SHAREDLIB}
-	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${SHAREDLIBDIR} ]; then confMKDIR -p ${DESTDIR}${SHAREDLIBDIR}; else :; fi ')
-	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}
-	ifelse(bldOS, `AIX', `${AR} ${AROPTS} ${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}', `rm -f ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}
-	${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}')
+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${SHAREDLIBDIR}" ]; then confMKDIR -p "${DESTDIR}${SHAREDLIBDIR}"; else :; fi ')
+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}"
+	ifelse(bldOS, `AIX', `${AR} ${AROPTS} "${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}"', `rm -f "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"
+	${LN} ${LNOPTS} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"')
 
 bldCURRENT_PRODUCT-clean:
 	rm -f ${OBJS} ${SHAREDLIB} bldCURRENT_PRODUCT.a ${MANPAGES} ifelse(bldOS, `AIX', `shr.o', `bldCURRENT_PRODUCT${SHAREDLIB_EXT}')
diff -Nru dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4 dkim-milter-2.8.3/dkim-filter/Makefile.m4
--- dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4	2009-02-09 21:53:09.000000000 +0200
+++ dkim-milter-2.8.3/dkim-filter/Makefile.m4	2009-07-19 09:51:59.000000000 +0300
@@ -74,7 +74,8 @@
 divert(bldTARGETS_SECTION)
 
 install-genkey:
-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh ${DESTDIR}${UBINDIR}/dkim-genkey
+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${UBINDIR}" ]; then confMKDIR -p "${DESTDIR}${UBINDIR}"; else :; fi ')
+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh "${DESTDIR}${UBINDIR}/dkim-genkey"
 
 divert(0)
 bldPRODUCT_END
diff -Nru dkim-milter-2.8.3.orig/libdkim/Makefile.m4 dkim-milter-2.8.3/libdkim/Makefile.m4
--- dkim-milter-2.8.3.orig/libdkim/Makefile.m4	2009-05-26 20:03:39.000000000 +0300
+++ dkim-milter-2.8.3/libdkim/Makefile.m4	2009-07-19 09:51:59.000000000 +0300
@@ -42,7 +42,8 @@
 divert(bldTARGETS_SECTION)
 
 install-dkim-includes:
-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/libdkim/dkim.h ${DESTDIR}${INCLUDEDIR}/dkim.h
+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${INCLUDEDIR}" ]; then confMKDIR -p "${DESTDIR}${INCLUDEDIR}"; else :; fi ')
+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 ${SRCDIR}/libdkim/dkim.h "${DESTDIR}${INCLUDEDIR}/dkim.h"
 bldPRODUCT_END
 
 define(`confCHECK_LIBS', `libdkim.a')dnl