From ec96454af3ee928848aacec327fd16970d24df27 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Fri, 22 Apr 2005 16:16:23 +0000
Subject: [PATCH] Fixing make install and chroot make process; revision should
 not be part of cvs

---
 tools/Makefile      |  1 +
 tools/chrootmake.sh | 16 ++++------------
 tools/mkboot        |  2 +-
 tools/revision      |  1 -
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 tools/revision

diff --git a/tools/Makefile b/tools/Makefile
index dcc178f3a..bc911594a 100755
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -66,6 +66,7 @@ hdboot:	image
 fdboot:	image
 	exec su root mkboot $@
 
+install: hdboot
 
 # clean up compile results
 clean:
diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 53821dd94..ae4c4c303 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -1,20 +1,12 @@
 #!/bin/sh
-
-DIST=/usr/dist
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-
+cd /usr || exit 1
+tar cf src.tar src || exit 1
 cd /usr/src || exit 1
-mkdir -p $DIST
-#echo "Making src.tar"
-#tar cf /dist/src.tar /usr/src || exit 1
 make world install || exit 1
-
 cd tools || exit 1
 make hdboot
-
-#rm -rf /usr/src
-#echo "Making bin.tar"
-#tar cf /dist/bin.tar /
-
+cd /usr || exit 1
+rm -rf /usr/src || exit 1
 exit 0
 
diff --git a/tools/mkboot b/tools/mkboot
index 2170871fc..09a96e249 100755
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -47,7 +47,7 @@ hdboot)
 	# Install a new image on the root device.
 	if [ ! -d $rootdir/boot/image ]
 	then
-		# /boot/image is not yet a directory!  Fix it.
+		 /boot/image is not yet a directory!  Fix it.
 		su root -c \
 		    "exec mv $rootdir/boot/image /M"
 		install -d $rootdir/boot/image
diff --git a/tools/revision b/tools/revision
deleted file mode 100644
index b1e7d265f..000000000
--- a/tools/revision
+++ /dev/null
@@ -1 +0,0 @@
-61