diff --git a/cf/destdirs.m4 b/cf/destdirs.m4
index 0984fc992..36baafd3e 100644
--- a/cf/destdirs.m4
+++ b/cf/destdirs.m4
@@ -2,25 +2,17 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN([rk_DESTDIRS], 
-[
+AC_DEFUN([rk_DESTDIRS], [
 # This is done by AC_OUTPUT but we need the result here.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-for i in bin lib libexec sbin; do
-	i=${i}dir
-	foo=AS_TR_CPP($i)
-	x="\$${i}"
+AC_FOREACH([rk_dir], [bin lib libexec localstate sbin sysconf], [
+	x="${rk_dir[]dir}"
 	eval y="$x"
 	while test "x$y" != "x$x"; do
 		x="$y"
 		eval y="$x"
 	done
-	AC_DEFINE_UNQUOTED($foo,"$x")
-done
-AH_BOTTOM([#undef BINDIR 
-#undef LIBDIR
-#undef LIBEXECDIR
-#undef SBINDIR])
-])
\ No newline at end of file
+	AC_DEFINE_UNQUOTED(AS_TR_CPP(rk_dir[]dir), "$x", [path to ]rk_dir[])])
+])