Index: gnu/lib/Makefile
===================================================================
--- gnu/lib/Makefile
+++ gnu/lib/Makefile
@@ -8,13 +8,10 @@
 
 SUBDIR.${MK_DIALOG}+=	libdialog
 SUBDIR.${MK_GCC}+=	libgcov libgomp
+SUBDIR.${MK_GDB}+=	libreadline
 SUBDIR.${MK_SSP}+=	libssp
 SUBDIR.${MK_TESTS}+=	tests
 
-.if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
-SUBDIR+=	libreadline
-.endif
-
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
 .if ${MK_GNUCXX} != "no"
Index: gnu/usr.bin/Makefile
===================================================================
--- gnu/usr.bin/Makefile
+++ gnu/usr.bin/Makefile
@@ -6,20 +6,16 @@
 
 .if ${MK_CXX} != "no"
 SUBDIR.${MK_GCC}+=	gperf
-SUBDIR.${MK_GROFF}+=	groff
 .endif
 
 SUBDIR.${MK_BINUTILS}+=	binutils
 SUBDIR.${MK_DIALOG}+=	dialog
-
-.if ${MK_BINUTILS} != "no"
-SUBDIR.${MK_GDB}+=	gdb
-.endif
-
 SUBDIR.${MK_GCC}+=	cc
 SUBDIR.${MK_GNU_DIFF}+=	diff diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
+SUBDIR.${MK_GDB}+=	gdb
 SUBDIR.${MK_GPL_DTC}+=	dtc
+SUBDIR.${MK_GROFF}+=	groff
 SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=