--- Libc/Libc-583/Makefile.inc
+++ Libc/Libc-498/Makefile.inc
@@ -6,6 +6,9 @@
 # errors if the included makefiles don't change these:
 MDSRCS=
 MISRCS=
+MDASM=
+MIASM=
+NOASM=
 
 # SUPPRESSSRCS is used to prevent machine-independent files from being
 # built, when a machine-dependent file defines multiple symbols.
@@ -17,48 +20,72 @@
 AUTOPATCHMAN=
 AUTOPATCHSRCS=
 
-# Auto-patch (or symlink)
+# Auto-patch into OBJROOT
 _AUTOPATCH: .USE
 	@if [ -f ${.ALLSRC}.patch ]; then \
-	    ${ECHO} ${CP} ${.ALLSRC} ${.TARGET}; \
-	    ${CP} ${.ALLSRC} ${.TARGET}; \
-	    ${ECHO} ${PATCH} ${.TARGET} ${.ALLSRC}.patch; \
-	    ${PATCH} ${.TARGET} ${.ALLSRC}.patch; \
+	    echo cp ${.ALLSRC} ${.TARGET}; \
+	    cp ${.ALLSRC} ${.TARGET}; \
+	    echo patch ${.TARGET} ${.ALLSRC}.patch; \
+	    patch ${.TARGET} ${.ALLSRC}.patch; \
 	else \
-	    t=`${BASENAME} ${.ALLSRC}` && x=`${DIRNAME} ${.ALLSRC}` && d=`${BASENAME} $$x`; \
-	    ${ECHO} ${LN} -fs $$d/$$t ${.TARGET}; \
-	    ${LN} -fs $$d/$$t ${.TARGET}; \
+	    echo ln -s ${.ALLSRC} ${.TARGET}; \
+	    ln -s ${.ALLSRC} ${.TARGET}; \
+	fi
+# Auto-patch into current directory
+_AUTOPATCHCUR: .USE
+	@echo cp ${.ALLSRC} ${.TARGET}; \
+	cp ${.ALLSRC} ${.TARGET}; \
+	if [ -f ${.ALLSRC}.patch ]; then \
+	    echo patch ${.TARGET} ${.ALLSRC}.patch; \
+	    patch ${.TARGET} ${.ALLSRC}.patch; \
 	fi
 # Standard compilation for the various forms
 _STANDARD_STATIC: .USE
-	${MYCC} -static \
+	${CC} -static \
 	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
 	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
 	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
 	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
 _STANDARD_PROFILE: .USE
-	${MYCC} -pg -DPROFILE \
+	${CC} -pg -DPROFILE \
 	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
 	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
 	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
 	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
 _STANDARD_DYNAMIC: .USE
-	${MYCC} \
+	${CC} \
 	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
 	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
 	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
 	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
 _STANDARD_DEBUG: .USE
-	${MYCC} -g -DDEBUG \
+	${CC} -g -DDEBUG \
 	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
 	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
 	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
 	    -c ${.IMPSRC} -o ${.TARGET}
 
+# set object file suffix
+.if make(lib${LIB}_static.a)
+OBJSUFFIX = o
+.endif
+.if make(lib${LIB}_profile.a)
+OBJSUFFIX = po
+.endif
+.if make(lib${LIB}_debug.a)
+OBJSUFFIX = do
+.endif
+.if make(lib${LIB}.a)
+OBJSUFFIX = So
+.endif
+
+.ifnmake autopatch
 #
 # If there is a machine dependent makefile, use it:
 #
-.sinclude "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.endif
 
 .include "${.CURDIR}/darwin/Makefile.inc"
 .include "${.CURDIR}/db/Makefile.inc"
@@ -68,9 +95,7 @@
 .include "${.CURDIR}/gen/Makefile.inc"
 .include "${.CURDIR}/gmon/Makefile.inc"
 .include "${.CURDIR}/include/Makefile.inc"
-.ifdef FEATURE_LEGACY_NX_INTERNAT_APIS
 .include "${.CURDIR}/internat/Makefile.inc"
-.endif
 .include "${.CURDIR}/locale/Makefile.inc"
 .include "${.CURDIR}/man/Makefile.inc"
 .include "${.CURDIR}/net/Makefile.inc"
@@ -103,3 +128,4 @@
 .endif
 .endfor
 .endif
+.endif # !autopatch