--- Libc/Libc-498/Makefile.fbsd_end
+++ Libc/Libc-391/Makefile.fbsd_end
@@ -13,55 +13,32 @@
 FBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
 .for _src in ${FBSDSRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHSYM
 SRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-fbsd.${_src:E}
 .endfor
 
 .for _src in ${FBSDMDSRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHSYM
 MDSRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-fbsd.${_src:E}
 .endfor
 
 .for _src in ${FBSDMISRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHSYM
 MISRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-fbsd.${_src:E}
 .endfor
 
-# FBSDPATCHSRCS are for source that need patching, but don't build
-# in base variant (only in other variants)
-.ifmake autopatch
-.for _src in ${FBSDPATCHSRCS}
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
+.for _src in ${FBSDHDRS}
+${SYMROOT}/${_src}: FreeBSD/${_src} _AUTOPATCHSYM
+AUTOPATCHHDRS+= ${SYMROOT}/${_src}
 .endfor
-.endif # autopatch
-
-.ifmake autopatch
-.for _src in ${FBSDHDRS}
-${_src}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHHDRS+= ${_src}
-.endfor
-.endif # autopatch
 
 .for _sect in ${FBSDSECTIONS}
 .for _src in ${FBSDMAN${_sect}}
-.ifmake autopatch
 ${_src}: FreeBSD/${_src} _AUTOPATCH
+MAN${_sect}+= ${_src}
 AUTOPATCHMAN+= ${_src}
-.else # !autopatch
-MAN${_sect}+= ${_src}
-.endif # autopatch
 .endfor
 .endfor