diff --git a/infrastructure/mk/gnu.port.mk b/infrastructure/mk/gnu.port.mk
index 47c42f7d542..fdf2ed63d47 100644
--- a/infrastructure/mk/gnu.port.mk
+++ b/infrastructure/mk/gnu.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-# $OpenBSD: gnu.port.mk,v 1.25 2005/12/26 21:29:41 naddy Exp $
+# $OpenBSD: gnu.port.mk,v 1.26 2006/07/10 10:12:05 espie Exp $
 #	Based on bsd.port.mk, originally by Jordan K. Hubbard.
 #	This file is in the public domain.
 
@@ -41,14 +41,13 @@ MODGNU_CONFIG_GUESS_DIRS?=${WRKSRC}
 MODGNU_SAVE_CACHE?= No
 MODGNU_SAVE_CACHE_LOCATION=${PORTSDIR}/config
 
-MODGNU_configure =
-.for _d in ${MODGNU_CONFIG_GUESS_DIRS}
-MODGNU_configure += cp -f ${PORTSDIR}/infrastructure/db/config.guess ${_d};
-MODGNU_configure += chmod a+rx ${_d}/config.guess;
-MODGNU_configure += cp -f ${PORTSDIR}/infrastructure/db/config.sub ${_d};
-MODGNU_configure += chmod a+rx ${_d}/config.sub;
-.endfor
-MODGNU_configure += ${MODSIMPLE_configure}
+MODGNU_configure = for d in ${MODGNU_CONFIG_GUESS_DIRS}; do \
+		cp -f ${PORTSDIR}/infrastructure/db/config.guess $$d; \
+		chmod a+rx $$d/config.guess; \
+		cp -f ${PORTSDIR}/infrastructure/db/config.sub $$d; \
+		chmod a+rx $$d/config.sub; \
+	done; ${MODSIMPLE_configure}
+
 .if ${MODGNU_SAVE_CACHE:L} == "yes"
 MODGNU_configure += ; mkdir -p ${MODGNU_SAVE_CACHE_LOCATION}; \
 	cp ${WRKBUILD}/config.cache ${MODGNU_SAVE_CACHE_LOCATION}/${FULLPKGNAME} \