diff --git a/source/main.mk b/source/main.mk
index 5e31044..85adaba 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -1,95 +1,95 @@
 mkinclude dynconfig.mk
-heimdalsrcdir := heimdal
+heimdalsrcdir := ${srcdir}/heimdal
 mkinclude heimdal_build/config.mk
 mkinclude config.mk
-dsdbsrcdir := dsdb
+dsdbsrcdir := ${srcdir}/dsdb
 mkinclude dsdb/config.mk
-smbdsrcdir := smbd
+smbdsrcdir := ${srcdir}/smbd
 mkinclude smbd/config.mk
-clustersrcdir := cluster
+clustersrcdir := ${srcdir}/cluster
 mkinclude cluster/config.mk
 mkinclude smbd/process_model.mk
-libnetsrcdir := libnet
+libnetsrcdir := ${srcdir}/libnet
 mkinclude libnet/config.mk
-authsrcdir := auth
+authsrcdir := ${srcdir}/auth
 mkinclude auth/config.mk
-nsswitchsrcdir := nsswitch
+nsswitchsrcdir := ${srcdir}/nsswitch
 mkinclude nsswitch/config.mk
-libsrcdir := lib
+libsrcdir := ${srcdir}/lib
 mkinclude lib/samba3/config.mk
-libsocketsrcdir := lib/socket
+libsocketsrcdir := ${srcdir}/lib/socket
 mkinclude lib/socket/config.mk
-libcharsetsrcdir := lib/charset
+libcharsetsrcdir := ${srcdir}/lib/charset
 mkinclude lib/charset/config.mk
-ldb_sambasrcdir := lib/ldb-samba
+ldb_sambasrcdir := ${srcdir}/lib/ldb-samba
 mkinclude lib/ldb-samba/config.mk
-libtlssrcdir := lib/tls
+libtlssrcdir := ${srcdir}/lib/tls
 mkinclude lib/tls/config.mk
-libregistrysrcdir := lib/registry
+libregistrysrcdir := ${srcdir}/lib/registry
 mkinclude lib/registry/config.mk
-libmessagingsrcdir := lib/messaging
+libmessagingsrcdir := ${srcdir}/lib/messaging
 mkinclude lib/messaging/config.mk
-libeventssrcdir := lib/events
+libeventssrcdir := ${srcdir}/lib/events
 mkinclude lib/events/config.mk
-libcmdlinesrcdir := lib/cmdline
+libcmdlinesrcdir := ${srcdir}/lib/cmdline
 mkinclude lib/cmdline/config.mk
-socketwrappersrcdir := lib/socket_wrapper
+socketwrappersrcdir := ${srcdir}/lib/socket_wrapper
 mkinclude lib/socket_wrapper/config.mk
-nsswrappersrcdir := lib/nss_wrapper
+nsswrappersrcdir := ${srcdir}/lib/nss_wrapper
 mkinclude lib/nss_wrapper/config.mk
-appwebsrcdir := lib/appweb
+appwebsrcdir := ${srcdir}/lib/appweb
 mkinclude lib/appweb/config.mk
-libstreamsrcdir := lib/stream
+libstreamsrcdir := ${srcdir}/lib/stream
 mkinclude lib/stream/config.mk
-libutilsrcdir := lib/util
+libutilsrcdir := ${srcdir}/lib/util
 mkinclude lib/util/config.mk
-libtdrsrcdir := lib/tdr
+libtdrsrcdir := ${srcdir}/lib/tdr
 mkinclude lib/tdr/config.mk
-libdbwrapsrcdir := lib/dbwrap
+libdbwrapsrcdir := ${srcdir}/lib/dbwrap
 mkinclude lib/dbwrap/config.mk
-libcryptosrcdir := lib/crypto
+libcryptosrcdir := ${srcdir}/lib/crypto
 mkinclude lib/crypto/config.mk
-libtorturesrcdir := lib/torture
+libtorturesrcdir := ${srcdir}/lib/torture
 mkinclude lib/torture/config.mk
-libcompressionsrcdir := lib/compression
-libgencachesrcdir := lib
+libcompressionsrcdir := ${srcdir}/lib/compression
+libgencachesrcdir := ${srcdir}/lib
 mkinclude lib/basic.mk
-paramsrcdir := param
+paramsrcdir := ${srcdir}/param
 mkinclude param/config.mk
-smb_serversrcdir := smb_server
+smb_serversrcdir := ${srcdir}/smb_server
 mkinclude smb_server/config.mk
-rpc_serversrcdir := rpc_server
+rpc_serversrcdir := ${srcdir}/rpc_server
 mkinclude rpc_server/config.mk
-ldap_serversrcdir := ldap_server
+ldap_serversrcdir := ${srcdir}/ldap_server
 mkinclude ldap_server/config.mk
-web_serversrcdir := web_server
+web_serversrcdir := ${srcdir}/web_server
 mkinclude web_server/config.mk
-winbindsrcdir := winbind
+winbindsrcdir := ${srcdir}/winbind
 mkinclude winbind/config.mk
-nbt_serversrcdir := nbt_server
+nbt_serversrcdir := ${srcdir}/nbt_server
 mkinclude nbt_server/config.mk
-wrepl_serversrcdir := wrepl_server
+wrepl_serversrcdir := ${srcdir}/wrepl_server
 mkinclude wrepl_server/config.mk
-cldap_serversrcdir := cldap_server
+cldap_serversrcdir := ${srcdir}/cldap_server
 mkinclude cldap_server/config.mk
-utilssrcdir := utils
+utilssrcdir := ${srcdir}/utils
 mkinclude utils/net/config.mk
 mkinclude utils/config.mk
-ntvfssrcdir := ntvfs
+ntvfssrcdir := ${srcdir}/ntvfs
 mkinclude ntvfs/config.mk
-ntptrsrcdir := ntptr
+ntptrsrcdir := ${srcdir}/ntptr
 mkinclude ntptr/config.mk
-torturesrcdir := torture
+torturesrcdir := ${srcdir}/torture
 mkinclude torture/config.mk
-librpcsrcdir := librpc
+librpcsrcdir := ${srcdir}/librpc
 mkinclude librpc/config.mk
-clientsrcdir := client
+clientsrcdir := ${srcdir}/client
 mkinclude client/config.mk
-libclisrcdir := libcli
+libclisrcdir := ${srcdir}/libcli
 mkinclude libcli/config.mk
-ejsscriptsrcdir := scripting/ejs
+ejsscriptsrcdir := ${srcdir}/scripting/ejs
 mkinclude scripting/ejs/config.mk
-pyscriptsrcdir := scripting/python
+pyscriptsrcdir := ${srcdir}/scripting/python
 mkinclude scripting/python/config.mk
-kdcsrcdir := kdc
+kdcsrcdir := ${srcdir}/kdc
 mkinclude kdc/config.mk