--- Libc/Libc-583/Makefile.fbsd_end
+++ Libc/Libc-391/Makefile.fbsd_end
@@ -12,61 +12,33 @@
 
 FBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
-# This .for statement forces evaluation of ${_cwd}
-.for _cwd in ${CWD}
-
 .for _src in ${FBSDSRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-fbsd.${_src:E}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_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
-${_cwd}/${_src:R}-fbsd.${_src:E}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_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
-${_cwd}/${_src:R}-fbsd.${_src:E}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_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}
-${_cwd}/${_src:R}-fbsd.${_src:E}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_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}
-${_cwd}/${_src}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHHDRS+= ${_cwd}/${_src}
-.endfor
-.endif # autopatch
 
 .for _sect in ${FBSDSECTIONS}
 .for _src in ${FBSDMAN${_sect}}
-.ifmake autopatch
-${_cwd}/${_src}: ${_cwd}/FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHMAN+= ${_cwd}/${_src}
-.else # !autopatch
+${_src}: FreeBSD/${_src} _AUTOPATCH
 MAN${_sect}+= ${_src}
-.endif # autopatch
+AUTOPATCHMAN+= ${_src}
 .endfor
 .endfor
-
-.endfor # _cwd