--- cci/usr/src/etc/config/mkmakefile.c	2019/07/28 12:24:19	1.1.1.1
+++ cci/usr/src/etc/config/mkmakefile.c	2019/07/28 12:24:39	1.1.1.2
@@ -117,10 +117,6 @@ makefile()
 			fprintf(ofp, " -D%s=\"%s\"", op->op_name, op->op_value);
 		else
 			fprintf(ofp, " -D%s", op->op_name);
-#ifdef tahoe
-	if (maxusers >= 30) 
-			fprintf(ofp, " -DGLOBKEY" );
-#endif
 	fprintf(ofp, "\n");
 	if (hadtz == 0)
 		printf("timezone not specified; gmt assumed\n");
@@ -236,6 +232,8 @@ next:
 	if (wd == (char *)EOF) {
 		(void) fclose(fp);
 		if (first == 1) {
+			tp=new_fent();
+			tp->f_type = FILESPT;
 			(void) sprintf(fname, "files.%s", machinename);
 			first++;
 			goto openit;
@@ -360,6 +358,11 @@ do_objs(fp)
 	fprintf(fp, "OBJS=");
 	lpos = 6;
 	for (tp = ftab; tp != 0; tp = tp->f_next) {
+		if (tp->f_type == FILESPT){
+			fprintf(fp,"\nMOBJS=");
+			lpos = 6;
+			goto cont;
+			}
 		if (tp->f_type == INVISIBLE)
 			continue;
 		sp = tail(tp->f_fn);
@@ -396,6 +399,11 @@ do_cfiles(fp)
 	fprintf(fp, "CFILES=");
 	lpos = 8;
 	for (tp = ftab; tp != 0; tp = tp->f_next) {
+		if (tp->f_type == FILESPT){
+			fprintf(fp,"\nMCFILES=");
+			lpos = 8;
+			goto cont1;
+			}
 		if (tp->f_type == INVISIBLE)
 			continue;
 		if (tp->f_fn[strlen(tp->f_fn)-1] != 'c')
@@ -406,6 +414,8 @@ do_cfiles(fp)
 		}
 		fprintf(fp, "../%s ", tp->f_fn);
 		lpos += len + 1;
+cont1:
+		;
 	}
 	if (lpos != 8)
 		putc('\n', fp);
@@ -438,6 +448,8 @@ do_rules(f)
 	char *extras;
 
 for (ftp = ftab; ftp != 0; ftp = ftp->f_next) {
+	if (ftp->f_type == FILESPT)
+		continue;
 	if (ftp->f_type == INVISIBLE)
 		continue;
 	cp = (np = ftp->f_fn) + strlen(ftp->f_fn) - 1;
@@ -576,7 +588,7 @@ do_systemspec(f, fl, first)
 	int first;
 {
 
-	fprintf(f, "%s: makefile locore.o ${OBJS} param.o", fl->f_needs);
+	fprintf(f, "%s: makefile locore.o ${OBJS} ${MOBJS} param.o", fl->f_needs);
 	fprintf(f, " ioconf.o swap%s.o sys5_name.o ${LIBSYS}\n", fl->f_fn);
 	fprintf(f, "\t@echo loading %s\n\t@rm -f %s\n",
 	    fl->f_needs, fl->f_needs);
@@ -601,7 +613,7 @@ do_systemspec(f, fl, first)
 			fl->f_needs);
 		break;
 	}
-	fprintf(f, "locore.o ${OBJS} vers.o ioconf.o param.o ");
+	fprintf(f, "locore.o ${OBJS} ${MOBJS} vers.o ioconf.o param.o ");
 	fprintf(f, "swap%s.o sys5_name.o ${LIBSYS}\n", fl->f_fn);
 	fprintf(f, "\t@echo rearranging symbols\n");
 	if ( machine == MACHINE_TAHOE)