--- Libc/Libc-763.13/Makefile.nbsd_end
+++ Libc/Libc-391.2.9/Makefile.nbsd_end
@@ -12,52 +12,33 @@
 
 NBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
-# This .for statement forces evaluation of ${CWD}
-.for _cwd in ${CWD}
-
 .for _src in ${NBSDSRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-nbsd.${_src:E}: ${_cwd}/NetBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-nbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHSYM
 SRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-nbsd.${_src:E}
 .endfor
 
 .for _src in ${NBSDMDSRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-nbsd.${_src:E}: ${_cwd}/NetBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-nbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHSYM
 MDSRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-nbsd.${_src:E}
 .endfor
 
 .for _src in ${NBSDMISRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-nbsd.${_src:E}: ${_cwd}/NetBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-nbsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHSYM
 MISRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-nbsd.${_src:E}
 .endfor
 
-.ifmake autopatch
 .for _src in ${NBSDHDRS}
-${_cwd}/${_src}: ${_cwd}/NetBSD/${_src} _AUTOPATCH
-AUTOPATCHHDRS+= ${_cwd}/${_src}
+${SYMROOT}/${_src}: NetBSD/${_src} _AUTOPATCHSYM
+AUTOPATCHHDRS+= ${SYMROOT}/${_src}
 .endfor
-.endif # autopatch
 
 .for _sect in ${NBSDSECTIONS}
 .for _src in ${NBSDMAN${_sect}}
-.ifmake autopatch
-${_cwd}/${_src}: ${_cwd}/NetBSD/${_src} _AUTOPATCH
-AUTOPATCHMAN+= ${_cwd}/${_src}
-.else # !autopatch
+${_src}: NetBSD/${_src} _AUTOPATCH
 MAN${_sect}+= ${_src}
-.endif # autopatch
+AUTOPATCHMAN+= ${_src}
 .endfor
 .endfor
-
-.endfor # _cwd