--- Libc/Libc-391/Makefile.inc
+++ Libc/Libc-583/Makefile.inc
@@ -6,9 +6,6 @@
 # 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.
@@ -20,32 +17,48 @@
 AUTOPATCHMAN=
 AUTOPATCHSRCS=
 
-# Auto-patch into OBJROOT
+# Auto-patch (or symlink)
 _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 \
-	    echo ln -s ${.ALLSRC} ${.TARGET}; \
-	    ln -s ${.ALLSRC} ${.TARGET}; \
+	    t=`${BASENAME} ${.ALLSRC}` && x=`${DIRNAME} ${.ALLSRC}` && d=`${BASENAME} $$x`; \
+	    ${ECHO} ${LN} -fs $$d/$$t ${.TARGET}; \
+	    ${LN} -fs $$d/$$t ${.TARGET}; \
 	fi
-# Auto-patch into SYMROOT
-_AUTOPATCHSYM: .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 \
+	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
+	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
+	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
+	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
+_STANDARD_PROFILE: .USE
+	${MYCC} -pg -DPROFILE \
+	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
+	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
+	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
+	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
+_STANDARD_DYNAMIC: .USE
+	${MYCC} \
+	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
+	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
+	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
+	    -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
+_STANDARD_DEBUG: .USE
+	${MYCC} -g -DDEBUG \
+	    ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
+	    ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
+	    ${VARIANTCFLAGS} ${LIBCFLAGS} \
+	    -c ${.IMPSRC} -o ${.TARGET}
 
 #
 # If there is a machine dependent makefile, use it:
 #
-.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
-.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
-.endif
+.sinclude "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
 
 .include "${.CURDIR}/darwin/Makefile.inc"
 .include "${.CURDIR}/db/Makefile.inc"
@@ -55,17 +68,17 @@
 .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}/mach/Makefile.inc"
+.include "${.CURDIR}/man/Makefile.inc"
 .include "${.CURDIR}/net/Makefile.inc"
 .include "${.CURDIR}/nls/Makefile.inc"
 .include "${.CURDIR}/posix1e/Makefile.inc"
 .include "${.CURDIR}/pthreads/Makefile.inc"
-.if !defined(NO_QUAD)
-#.include "${.CURDIR}/quad/Makefile.inc"
-.endif
 .include "${.CURDIR}/regex/Makefile.inc"
+.include "${.CURDIR}/secure/Makefile.inc"
 .include "${.CURDIR}/stdio/Makefile.inc"
 .include "${.CURDIR}/stdlib/Makefile.inc"
 .include "${.CURDIR}/stdtime/Makefile.inc"
@@ -74,15 +87,6 @@
 .include "${.CURDIR}/threads/Makefile.inc"
 .include "${.CURDIR}/util/Makefile.inc"
 .include "${.CURDIR}/uuid/Makefile.inc"
-#.include "${.CURDIR}/rpc/Makefile.inc"
-#.include "${.CURDIR}/xdr/Makefile.inc"
-#.if !defined(NO_YP_LIBC)
-#CFLAGS+= -DYP
-#.include "${.CURDIR}/yp/Makefile.inc"
-#.endif
-#.if !defined(NO_HESIOD_LIBC)
-#CFLAGS+= -DHESIOD
-#.endif
 
 # If there are no machine dependent sources, append all the
 # machine-independent sources: