From: Ben Gras <ben@minix3.org>
Date: Fri, 21 Oct 2005 11:40:24 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v3.1.2a~571
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=12898c03e4aac531e08e3e975f139797702b3692;p=minix.git

*** empty log message ***
---

diff --git a/tools/Makefile b/tools/Makefile
index d0c25446f..ab652518f 100755
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,6 +5,7 @@ CC=	exec cc
 CFLAGS=	-O -D_MINIX -D_POSIX_SOURCE
 MDEC=	/usr/mdec
 MAKE=	exec make -$(MAKEFLAGS)
+GMAKE=/usr/gnu/bin/gmake
 
 # Specify the programs that are part of the system image.
 # Multiple boot medium drivers can be included in the image, 
@@ -50,7 +51,7 @@ usage:
 
 # create a fresh configuration or system image
 fresh: 
-	cd ../lib && $(MAKE) clean
+	cd ../lib && $(GMAKE) clean
 	$(MAKE) clean 
 	$(MAKE) libraries services
 
@@ -70,7 +71,7 @@ image_small:  includes
 
 # rebuild the program or system libraries
 includes:
-	cd ../include && $(MAKE) install
+#	cd ../include && $(MAKE) install
 
 depend: includes
 	cd ../ && $(MAKE) depend
@@ -81,7 +82,9 @@ services: includes
 	cd ../drivers && $(MAKE) install
 
 libraries: includes
-	cd ../lib && $(MAKE) install
+	cd ../lib && $(GMAKE) clean
+	cd ../lib && $(GMAKE) all
+	cd ../lib && $(GMAKE) install
 
 
 # make bootable and place system images
diff --git a/tools/release.sh b/tools/release.sh
index 07601f339..a4ed794ce 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -52,7 +52,7 @@ usr_roflag="-r"' > $RELEASEDIR/etc/fstab
 
 HDEMU=1
 
-COPYITEMS="usr/bin bin usr/lib"
+COPYITEMS="usr/bin bin usr/lib usr/gnu"
 RELEASEDIR=/usr/r
 IMAGE=cdfdimage
 ROOTIMAGE=rootimage
@@ -94,7 +94,7 @@ ISO=${ISO}.iso
 ISOGZ=${ISO}.gz
 echo "Making $ISOGZ"
 
-USRMB=400
+USRMB=500
 
 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
 USRSECTS="`expr $USRMB \* 1024 \* 2`"
@@ -179,8 +179,8 @@ else
 fi
 
 echo " * Fixups for owners and modes of dirs and files"
-chown -R bin $RELEASEDIR/usr/src
-chmod -R u+w $RELEASEDIR/usr/lib
+chown -R bin $RELEASEDIR/usr/src $RELEASEDIR/usr/gnu
+chmod -R u+w $RELEASEDIR/usr/src $RELEASEDIR/usr/gnu
 find $RELEASEDIR/usr/src -type d | xargs chmod 755
 find $RELEASEDIR/usr/src -type f | xargs chmod 644
 find $RELEASEDIR/usr/src -name configure | xargs chmod 755