Move mkfiles from /etc/mk to /usr/share/mk

Simplifies pkgsrc porting.

Makefile

@@ -36,7 +36,7 @@ world: mkfiles includes depend gnu-libraries install
 .endif
 
 mkfiles:
-	cp etc/mk/*.mk /etc/mk/
+	make -C share/mk install
 
 includes:
 	$(MAKE) -C include includes

commands/make/make.1

@@ -288,7 +288,7 @@ include statement.
 The
 .Fl m
 option can be used multiple times to form a search path.
-This path will override the default system include path: /etc/mk.
+This path will override the default system include path: /usr/share/mk.
 Furthermore the system include path will be appended to the search path used
 for
 .Qo Ar file Qc Ns -style
@@ -1800,7 +1800,7 @@ see the description of
 .Ql Va .OBJDIR
 for more details.
 .Sh FILES
-.Bl -tag -width /etc/mk -compact
+.Bl -tag -width /usr/share/mk -compact
 .It .depend
 list of dependencies
 .It Makefile
@@ -1809,7 +1809,7 @@ list of dependencies
 list of dependencies
 .It sys.mk
 system makefile
-.It /etc/mk
+.It /usr/share/mk
 system makefile directory
 .El
 .Sh COMPATIBILITY

commands/make/pathnames.h

@@ -46,12 +46,8 @@
 #endif
 #define	_PATH_DEFSYSMK		"sys.mk"
 #ifndef _PATH_DEFSYSPATH
-#if defined(__minix)
-#define	_PATH_DEFSYSPATH	"/etc/mk"
-#else
 #define	_PATH_DEFSYSPATH	"/usr/share/mk"
 #endif
-#endif
 #ifndef _PATH_TMP
 #define	_PATH_TMP		"/tmp/"		/* with trailing slash */
 #endif

docs/UPDATING

@@ -1,3 +1,7 @@
+20100625:
+	/etc/mk has been moved to /usr/share/mk. You will need to
+	create /usr/share/mk manually.
+	# mkdir /usr/share/mk
 20100515:
         /usr/src/etc/usr/rc updated: copy it (or merge it) to /usr/etc/rc.
 	/etc/inet.conf is now line-based; if you have hand-edited this file

etc/Makefile

@@ -6,7 +6,6 @@ FILES1=fstab group hostname.file inet.conf motd.install mtab passwd profile \
 	rs.inet rs.single make.conf system.conf
 FILES2=shadow
 FILES3=daily dhcptags.conf rc
-DIR1=mk
 
 all::
 
@@ -20,11 +19,6 @@ install::
 	@echo "Making hierarchy.."
 	sh mtree.sh mtree/minix.tree
 	@for f in $(FILES3); do if [ -f $(USRETC)/$$f ]; then :; else cp usr/$$f $(USRETC); chmod 755 $(USRETC)/$$f; fi; done
-	@echo "Installing /etc/mk.."
-	rm $(ETC)/$(DIR1)/*
-	cp $(DIR1)/*.mk $(ETC)/$(DIR1)
-	chmod 644 $(ETC)/$(DIR1)/*
-	chown root $(ETC)/$(DIR1)/*
 	@echo "Making devices.."
 	p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh null
 	p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh std  2>/dev/null

etc/mtree/minix.tree

@@ -4,7 +4,6 @@
 755 root    operator /dev
 /dev/mouse -> /dev/kbdaux
 755 root    operator /etc
-755 root    operator /etc/mk
 755 root    operator /boot
 755 root    operator /boot/image
 555 root    operator /mnt
@@ -76,6 +75,7 @@
 700  root    operator  /usr/preserve
 755  root    operator  /usr/run
 755  root    operator  /usr/share
+755  root    operator  /usr/share/mk
 755  root    operator  /usr/share/zoneinfo
 755  root    operator  /usr/spool
 711  root    operator  /usr/spool/at

man/man1/Makefile

@@ -10,7 +10,7 @@ MAN=	acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
 	fsck.1 head.1 host.1 hostaddr.1 ifdef.1 \
 	install.1 isodir.1 isoinfo.1 isoread.1 join.1 kill.1 \
 	last.1 leave.1 loadfont.1 loadkeys.1 logger.1 login.1 \
-	look.1 lp.1 ls.1 lspci.1 M.1 mail.1 make.1 makewhatis.1 \
+	look.1 lp.1 ls.1 lspci.1 M.1 mail.1 makewhatis.1 \
 	man.1 mdb.1 mesg.1 mixer.1 mkdep.1 mkdir.1 mkfifo.1 mkfs.1 \
 	mkproto.1 modem.1 mount.1 mt.1 nice.1 nm.1 nohup.1 od.1 \
 	ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 passwd.1 \

share/Makefile

@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
 
-SUBDIR= zoneinfo
+SUBDIR= mk zoneinfo
 
 .include <bsd.subdir.mk>

tools/release.sh

@@ -353,13 +353,13 @@ rm -rf $RELEASEDIR/usr/$SRC/doc/bugs
 if [ "$USB" -eq 0 ]
 then	date >$RELEASEDIR/CD
 fi
-echo " * Bootstrap /etc/mk files"
-# Need /etc/mk in the new system to invoke make. Real ownerships
-# and permissions will be set by its own src/etc/Makefile.
-mkdir -p $RELEASEDIR/etc/mk
-chmod 755 $RELEASEDIR/etc/mk
-cp $RELEASEDIR/usr/src/etc/mk/* $RELEASEDIR/etc/mk/
-chown -R root $RELEASEDIR/etc/mk
+echo " * Bootstrap /usr/share/mk files"
+# Need /usr/share/mk in the new system to invoke make. Real ownerships
+# and permissions will be set by its own src/share/mk/Makefile.
+mkdir -p $RELEASEDIR/usr/share/mk
+chmod 755 $RELEASEDIR/usr/share/mk
+cp $RELEASEDIR/usr/src/share/mk/* $RELEASEDIR/usr/share/mk/
+chown -R root $RELEASEDIR/usr/share/mk
 echo " * Chroot build"
 cp chrootmake.sh $RELEASEDIR/usr/$SRC/tools/chrootmake.sh
 chroot $RELEASEDIR "PATH=/$XBIN MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1