From: Ben Gras <ben@minix3.org>
Date: Thu, 1 Sep 2005 15:26:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v3.1.0~205
X-Git-Url: http://zhaoyanbai.com/repos/named-checkzone.html?a=commitdiff_plain;h=6d5b90974a81252688f1f1e6e8e61d8dfcd19c34;p=minix.git

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

diff --git a/Makefile b/Makefile
index c7e381942..cbb315210 100755
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ usage:
 # for which it has to install /etc (for users and ownerships).
 # etcfiles also creates a directory hierarchy in its
 # 'make install' target.
-world:	etcfiles includes depend libraries cmds bigcmds install biginstallcmds postinstall
+world:	etcfiles includes depend libraries cmds bigcmds contrib install biginstallcmds postinstall
 
 includes:
 	cd include && $(MAKE) install
@@ -40,11 +40,11 @@ bigcmds:
 	cd commands && $(MAKE) bigall
 
 contrib:
-	cd contrib && $(MAKE) all
+	if [ -f contrib/Makefile ]; then cd contrib && $(MAKE) all; fi
 
 install::
 	cd commands && $(MAKE) $@
-#	cd contrib && $(MAKE) $@
+	if [ -f contrib/Makefile ]; then cd contrib && $(MAKE) install; fi
 
 biginstallcmds::
 	cd commands && $(MAKE) biginstall
@@ -62,6 +62,7 @@ clean::
 	cd lib && $(MAKE) $@
 	cd contrib && $(MAKE) $@
 	test ! -f commands/Makefile || { cd commands && $(MAKE) $@; }
+	if [ -f contrib/Makefile ]; then cd contrib && $(MAKE) clean; fi
 
 etcfiles::
 	cd etc && $(MAKE) install
diff --git a/contrib/gnu/Makefile b/contrib/gnu/Makefile
index 468c93f62..32ccf9dfc 100755
--- a/contrib/gnu/Makefile
+++ b/contrib/gnu/Makefile
@@ -1,4 +1,11 @@
 
-all install clean:
-	cd emacs-21.4 && $(MAKE) $@
-	cd lynx2-8-5 && $(MAKE) $@
+EMACS=emacs-21.4
+LYNX=lynx2-8-5
+
+#-[ -f $(EMACS)/Makefile ] && cd $(EMACS) && $(MAKE) $@
+
+all install::
+	cd $(LYNX) && sh MINIX/lynx.sh && bigmake $@
+
+all install clean::
+	if [ -f $(LYNX)/Makefile ] ; then cd $(LYNX) && bigmake $@; fi
diff --git a/tools/release.sh b/tools/release.sh
index 2e96a4bc2..aaa0189b6 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -59,7 +59,7 @@ ISO=minix.iso
 ISOGZ=minix.iso.gz
 RAM=/dev/ram
 BS=4096
-USRMB=150
+USRMB=350
 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
 ROOTMB=2
 ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"
@@ -76,12 +76,15 @@ do
 		exit 1
 	;;
 	h)
+		echo " * Making HD image"
 		HDEMU=1
 		;;
 	c)
+		echo " * Copying, not CVS"
 		COPY=1
 		;;
 	a)
+		echo " * Including contrib"
 		ALL=1
 		;;
 	esac
@@ -168,6 +171,12 @@ echo " * Transfering source to $RELEASEDIR"
 
 ( cd $srcdir && tar cf - . ) | ( cd $RELEASEDIR/usr && mkdir src && cd src && tar xf - )
 
+if [ "$ALL" = 0 ]
+then	echo " * Removing temporary cvs source tree"
+	rm -rf src
+fi
+
+echo " * Fixups for owners and modes of dirs and files"
 chown -R bin $RELEASEDIR/usr/src
 find $RELEASEDIR/usr/src -type d | xargs chmod 755
 find $RELEASEDIR/usr/src -type f | xargs chmod 644