Index: head/gnu/lib/Makefile
===================================================================
--- head/gnu/lib/Makefile	(revision 307651)
+++ head/gnu/lib/Makefile	(revision 307652)
@@ -1,34 +1,25 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR= csu libgcc libregex
 
 SUBDIR.${MK_DIALOG}+=	libdialog
-
-.if ${MK_GCC} != "no"
-SUBDIR+= libgcov libgomp
-.endif
-
-.if ${MK_SSP} != "no"
-SUBDIR+= libssp
-.endif
-
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_GCC}+=	libgcov libgomp
+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"
 SUBDIR+= libstdc++ libsupc++
 SUBDIR_DEPENDS_libsupc++:= libstdc++
 .endif
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>