-confopt="$confopt --enable-add-ons=nptl --disable-profile --with-tls"
-confopt="$confopt --libexecdir=$root/tmp/pt_chown --without-cvs"
-confopt="$confopt --with-headers=/${s1_prefix}/glibc-kernheaders"
+confopt="$confopt --enable-add-ons --disable-profile"
+confopt="$confopt --libexecdir=$prefix/lib/glibc --without-cvs"
+confopt="$confopt --enable-kernel=$kernver"