diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index e7a7228e8a7..097b9305f63 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -30,15 +30,15 @@ if test x$enable_fhs != xyes; then
 	SWATDIR="${datadir}/swat"
 	CODEPAGEDIR="${datadir}/codepages"
 	PAMMODULESDIR="${libdir}/security"
-	CONFIGDIR="${sysconfdir}"
-	PRIVATE_DIR="${prefix}/private"
-	LOCKDIR="${localstatedir}/lock"
-	PIDDIR="${localstatedir}/run"
-	STATEDIR="${localstatedir}/locks"
-	CACHEDIR="${localstatedir}/cache"
-	LOGFILEBASE="${localstatedir}"
-	SOCKET_DIR="${localstatedir}/run"
-	PRIVILEGED_SOCKET_DIR="${localstatedir}/lib"
+	CONFIGDIR="\${sysconfdir}"
+	PRIVATE_DIR="\${prefix}/private"
+	LOCKDIR="\${localstatedir}/lock"
+	PIDDIR="\${localstatedir}/run"
+	STATEDIR="\${localstatedir}/locks"
+	CACHEDIR="\${localstatedir}/cache"
+	LOGFILEBASE="\${localstatedir}"
+	SOCKET_DIR="\${localstatedir}/run"
+	PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib"
 else
 	AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
 
@@ -49,15 +49,15 @@ else
 	SWATDIR="${datadir}/samba/swat"
 	CODEPAGEDIR="${datadir}/samba/codepages"
 	PAMMODULESDIR="${libdir}/security"
-	CONFIGDIR="${sysconfdir}/samba"
-	PRIVATE_DIR="${localstatedir}/lib/samba/private"
-	LOCKDIR="${localstatedir}/lock/samba"
-	PIDDIR="${localstatedir}/run/samba"
-	STATEDIR="${localstatedir}/lib/samba"
-	CACHEDIR="${localstatedir}/cache/samba"
-	LOGFILEBASE="${localstatedir}/log/samba"
-	SOCKET_DIR="${localstatedir}/run/samba"
-	PRIVILEGED_SOCKET_DIR="${localstatedir}/lib/samba"
+	CONFIGDIR="\${sysconfdir}/samba"
+	PRIVATE_DIR="\${localstatedir}/lib/samba/private"
+	LOCKDIR="\${localstatedir}/lock/samba"
+	PIDDIR="\${localstatedir}/run/samba"
+	STATEDIR="\${localstatedir}/lib/samba"
+	CACHEDIR="\${localstatedir}/cache/samba"
+	LOGFILEBASE="\${localstatedir}/log/samba"
+	SOCKET_DIR="\${localstatedir}/run/samba"
+	PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
 fi
 
 AC_ARG_WITH(pammodulesdir,