--- Libc/Libc-498/Makefile.nbsd_end
+++ Libc/Libc-391.2.3/Makefile.nbsd_end
@@ -13,46 +13,32 @@
 NBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
 .for _src in ${NBSDSRCS}
-.ifmake autopatch
-${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_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
-${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_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
-${_src:R}-nbsd.${_src:E}: NetBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_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}
-${_src}: NetBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHHDRS+= ${_src}
+${SYMROOT}/${_src}: NetBSD/${_src} _AUTOPATCHSYM
+AUTOPATCHHDRS+= ${SYMROOT}/${_src}
 .endfor
-.endif # autopatch
 
 .for _sect in ${NBSDSECTIONS}
 .for _src in ${NBSDMAN${_sect}}
-.ifmake autopatch
 ${_src}: NetBSD/${_src} _AUTOPATCH
+MAN${_sect}+= ${_src}
 AUTOPATCHMAN+= ${_src}
-.else # !autopatch
-MAN${_sect}+= ${_src}
-.endif # autopatch
 .endfor
 .endfor