--- src/usr.sbin/config/main.c	2005/01/12 00:26:03	1.14
+++ src/usr.sbin/config/main.c	2005/11/02 08:28:48	1.15
@@ -163,9 +163,7 @@ main(int argc, char *argv[])
 	newbus_ioconf();
 	
 	/*
-	 * make symbolic links in compilation directory
-	 * for "sys" (to make genassym.c work along with #include <sys/xxx>)
-	 * and similarly for "machine".
+	 * "machine" points into <ARCH>/include - obsoleted by "arch"
 	 */
 	if (*srcdir == '\0')
 		snprintf(linkdest, sizeof(linkdest), "../../%s/include",
@@ -176,6 +174,17 @@ main(int argc, char *argv[])
 	symlink(linkdest, path("machine"));
 
 	/*
+	 * "arch" points into <ARCH>
+	 */
+	if (*srcdir == '\0')
+		snprintf(linkdest, sizeof(linkdest), "../../%s",
+		    machinename);
+	else
+		snprintf(linkdest, sizeof(linkdest), "%s/%s",
+		    srcdir, machinename);
+	symlink(linkdest, path("arch"));
+
+	/*
 	 * XXX check directory structure for architecture subdirectories and
 	 * create the symlinks automatically XXX
 	 */