--- Libc/Libc-583/Makefile.obsd_end
+++ Libc/Libc-391.5.22/Makefile.obsd_end
@@ -12,52 +12,33 @@
 
 OBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
-# This .for statement forces evaluation of ${CWD}
-.for _cwd in ${CWD}
-
 .for _src in ${OBSDSRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-obsd.${_src:E}: ${_cwd}/OpenBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-obsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-obsd.${_src:E}: OpenBSD/${_src} _AUTOPATCHSYM
 SRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-obsd.${_src:E}
 .endfor
 
 .for _src in ${OBSDMDSRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-obsd.${_src:E}: ${_cwd}/OpenBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-obsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-obsd.${_src:E}: OpenBSD/${_src} _AUTOPATCHSYM
 MDSRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-obsd.${_src:E}
 .endfor
 
 .for _src in ${OBSDMISRCS}
-.ifmake autopatch
-${_cwd}/${_src:R}-obsd.${_src:E}: ${_cwd}/OpenBSD/${_src} _AUTOPATCH
-AUTOPATCHSRCS+= ${_cwd}/${_src:R}-obsd.${_src:E}
-.else # !autopatch
+${SYMROOT}/${_src:R}-obsd.${_src:E}: OpenBSD/${_src} _AUTOPATCHSYM
 MISRCS+= ${_src}
-.endif # autopatch
+AUTOPATCHSRCS+= ${SYMROOT}/${_src:R}-obsd.${_src:E}
 .endfor
 
-.ifmake autopatch
 .for _src in ${OBSDHDRS}
-${_cwd}/${_src}: ${_cwd}/OpenBSD/${_src} _AUTOPATCH
-AUTOPATCHHDRS+= ${_cwd}/${_src}
+${SYMROOT}/${_src}: OpenBSD/${_src} _AUTOPATCHSYM
+AUTOPATCHHDRS+= ${SYMROOT}/${_src}
 .endfor
-.endif # autopatch
 
 .for _sect in ${OBSDSECTIONS}
 .for _src in ${OBSDMAN${_sect}}
-.ifmake autopatch
-${_cwd}/${_src}: ${_cwd}/OpenBSD/${_src} _AUTOPATCH
-AUTOPATCHMAN+= ${_cwd}/${_src}
-.else # !autopatch
+${_src}: OpenBSD/${_src} _AUTOPATCH
 MAN${_sect}+= ${_src}
-.endif # autopatch
+AUTOPATCHMAN+= ${_src}
 .endfor
 .endfor
-
-.endfor # _cwd