3 files changed, 5 insertions, 2 deletions
diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux
index 1cd276273d..d75a203b21 100644
--- a/dist/gdb/Makefile.linux
+++ b/dist/gdb/Makefile.linux
@@ -83,7 +83,8 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	export PATH="${staging}/bin/:$$PATH" && \
 	export LDFLAGS="-pthread -lm" && \
 	cd ${staging}/gdb-${version}-$* && \
-	${staging}/gdb-${version}/configure --disable-nls --target=$* --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
+	${staging}/gdb-${version}/configure --disable-nls --target=$* --with-separate-debug-dir="" \
+	--disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	sleep 3 && \
 	${MAKE} MAKEFLAGS+=-j1 && \
 	strip -o ${targetdir}/gdb-$* gdb/gdb
diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw
index 74365da427..354610a105 100644
--- a/dist/gdb/Makefile.mingw
+++ b/dist/gdb/Makefile.mingw
@@ -105,6 +105,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/lib/libexpat.a ${staging}/lib/libi
 	${staging}/gdb-${version}/configure --target=$* --disable-nls --disable-werror \
 	--with-libiconv-prefix=${staging} \
 	--with-expat --with-libexpat-prefix=${staging} \
+	--with-separate-debug-dir="" \
 	--with-python=${pydir} && \
 	${MAKE} MAKEFLAGS+= -j1 && \
 	strip -o ${targetdir}/gdb-$*.exe gdb/gdb.exe
diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx
index 6c4cbbf188..4060b166f8 100644
--- a/dist/gdb/Makefile.osx
+++ b/dist/gdb/Makefile.osx
@@ -79,7 +79,8 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	export PYTHONHOME=${staging} && \
 	export PATH="${staging}/bin/:$$PATH" && \
 	cd ${staging}/gdb-${version}-$* && \
-	${staging}/gdb-${version}/configure --disable-nls --disable-werror --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
+	${staging}/gdb-${version}/configure --disable-nls --target=$* --with-separate-debug-dir="" \
+        --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
 	strip -o ${targetdir}/gdb-$* gdb/gdb