From: Ben Gras <ben@minix3.org>
Date: Thu, 2 Feb 2006 17:13:07 +0000 (+0000)
Subject: fix builds not to do bigmakes
X-Git-Tag: v3.1.2a~392
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/static/style.css?a=commitdiff_plain;h=1bec73d61cf53543cd53926f399b76650b16ece9;p=minix.git

fix builds not to do bigmakes

gzip is out of the base system
---

diff --git a/commands/Makefile b/commands/Makefile
index 7e8148156..154009bce 100755
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -2,7 +2,6 @@
 
 MAKE	= exec make -$(MAKEFLAGS)
 FLEX=flex-2.5.4
-GZIP=gzip-1.2.4
 BZIP2=bzip2-1.0.3
 NVI=nvi-1.79
 NVIWORK=$(NVI)/minix
@@ -28,11 +27,9 @@ install: biginstall smallinstall
 
 small::
 	-mkdir $(NVIWORK)
-	cd $(GZIP) && CC="$(CC)" /bin/sh ./configure --prefix=/usr/local && $(MAKE) all
 	cd $(NVI) && make all
 
 smallinstall:: small
-	cd $(GZIP) && $(MAKE) install 
 	cd $(NVI) && make install
 
 big:
@@ -45,7 +42,6 @@ biginstall: big
 
 clean::
 	if [ -f $(FLEX)/Makefile ] ; then cd $(FLEX) && make $@; fi
-	if [ -f $(GZIP)/Makefile ] ; then cd $(GZIP) && make $@; fi
 	cd $(BZIP2) && make clean
 	if [ -f $(NVIWORK)/Makefile ]; then cd $(NVIWORK) && make clean; fi
 	for p in $(SMALLPROGRAMS); do ( cd $$p && make clean ); done
diff --git a/commands/bzip2-1.0.3/build b/commands/bzip2-1.0.3/build
index 24721c18c..03616c262 100755
--- a/commands/bzip2-1.0.3/build
+++ b/commands/bzip2-1.0.3/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 make clean
-bigmake all
+make all
 if [ "$1" != build ]
 then make install
 fi
diff --git a/commands/flex-2.5.4/build b/commands/flex-2.5.4/build
index 9f6a6aa2a..a56370ab0 100755
--- a/commands/flex-2.5.4/build
+++ b/commands/flex-2.5.4/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-CC=cc /bin/sh ./configure --prefix=/usr/local && bigmake all
-if [ $1 != build ]
+CC=cc /bin/sh ./configure --prefix=/usr/local && make all
+if [ "$1" != build ]
 then make install
 fi
diff --git a/commands/yap/build b/commands/yap/build
index 3ee5f0395..2fb378086 100755
--- a/commands/yap/build
+++ b/commands/yap/build
@@ -1,3 +1,5 @@
 #!/bin/sh
+set -e
 make clean
-make && make install
+make
+make install