Move grep after musl.

sysa/after.kaem.run

@@ -129,19 +129,13 @@ cd ${pkg}
 kaem --file ${pkg}.kaem
 cd ..
 
-# Part 18: grep
-pkg="grep-2.4"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# Part 19: heirloom-devtools
+# Part 18: heirloom-devtools
 pkg="heirloom-devtools-070527"
 cd ${pkg}
 kaem --file ${pkg}.kaem
 cd ..
 
-# Part 20: bash
+# Part 19: bash
 pkg="bash-2.05b"
 cd ${pkg}
 kaem --file ${pkg}.kaem

sysa/grep-2.4/grep-2.4.kaem

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-mkdir build
-cd build
-
-# Extract
-gunzip ../src/${pkg}.tar.gz
-tar xf ../src/${pkg}.tar
-cd ${pkg}
-cp ../../mk/main.mk Makefile
-
-# Build
-make
-
-# Install
-install grep /after/bin/
-
-# Test
-grep --version
-
-cd ../..

sysa/grep-2.4/mk/main.mk

@@ -21,3 +21,8 @@ all: grep
 
 grep: $(GREP_OBJECTS)
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
+install: all
+	install grep $(PREFIX)/bin
+	ln -sf $(PREFIX)/bin/grep $(PREFIX)/bin/egrep
+	ln -sf $(PREFIX)/bin/grep $(PREFIX)/bin/fgrep

sysa/run.sh

@@ -9,19 +9,22 @@ set -e
 
 export PREFIX=/after
 
-# Part 21
+# Part 20
 build m4-1.4.4
 
-# Part 22
+# Part 21
 build flex-2.5.11
 
-# Part 23
+# Part 22
 build musl-1.1.24
 
-# Part 24
+# Part 23
 build tcc-0.9.27 tcc-musl.sh
 
-# Part 25
+# Part 24
 build flex-2.6.4
 
+# Part 25
+build grep-2.4
+
 echo "Bootstrapping completed."