Added CPPFLAGS, CFLAGS, and LDFLAGS to the configuration options to support

machines with libraries and header files installed in alternate locations on unix-like operating systems. configure, workarea, checkin, c/Mf-base, c/Mf-* Added support for building from a directory that is not a git checkout in order to support creating release source packages. configure original commit: 41d94b0793997e3b90c10d6d28aaa4e2d43857cc
2016-05-11 19:23:58 -04:00 · 2016-05-11 19:23:58 -04:00 · 4582ed39d1
commit 4582ed39d1
parent 5718697d60
32 changed files with 98 additions and 58 deletions
--- a/c/Mf-a6fb
+++ b/c/Mf-a6fb
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses
-C = gcc -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-a6le
+++ b/c/Mf-a6le
@ -17,7 +17,7 @@ m = a6le
 Cpu = X86_64

 mdclib = -lm -ldl -lncurses -lrt
-C = gcc -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2
+C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-a6nb
+++ b/c/Mf-a6nb
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include
 mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a
-C = gcc -m64 -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-a6ob
+++ b/c/Mf-a6ob
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses
-C = gcc -Wpointer-arith -Werror -O
+C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-a6osx
+++ b/c/Mf-a6osx
@ -17,7 +17,7 @@ m = a6osx
 Cpu = X86_64

 mdclib = -liconv -lm -lncurses
-C = gcc -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-a6s2
+++ b/c/Mf-a6s2
@ -17,7 +17,7 @@ m = a6s2
 Cpu = X86_64

 mdclib = -lnsl -ldl -lm -lcurses -lrt
-C = gcc -m64 -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-arm32le
+++ b/c/Mf-arm32le
@ -17,7 +17,7 @@ m = arm32le
 Cpu = ARMV6

 mdclib = -lm -ldl -lncurses -lrt
-C = gcc -Wpointer-arith -Wextra -Werror -O2
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS}
 o = o
 mdsrc = arm32le.c
 mdobj = arm32le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; ./configure)
--- a/c/Mf-base
+++ b/c/Mf-base
@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+include Mf-config
+
 Include=../boot/$m
 ZlibInclude=../zlib
 PetiteBoot=../boot/$m/petite.boot
--- a/c/Mf-i3fb
+++ b/c/Mf-i3fb
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses
-C = gcc -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3le
+++ b/c/Mf-i3le
@ -17,7 +17,7 @@ m = i3le
 Cpu = I386

 mdclib = -lm -ldl -lncurses -lrt
-C = gcc -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector
+C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3nb
+++ b/c/Mf-i3nb
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
 mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a
-C = gcc -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3ob
+++ b/c/Mf-i3ob
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses
-C = gcc -Wpointer-arith -Werror -O
+C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3osx
+++ b/c/Mf-i3osx
@ -17,7 +17,7 @@ m = i3osx
 Cpu = I386

 mdclib = -liconv -lm -lncurses
-C = gcc -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3qnx
+++ b/c/Mf-i3qnx
@ -17,7 +17,7 @@ m = i3qnx
 Cpu = I386

 mdclib = -lm /usr/local/lib/libiconv.so -lsocket -lncurses
-C = qcc -m32 -Wpointer-arith -Wextra -Werror -O2 -N2048K
+C = qcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -N2048K ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -mi386nto -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-i3s2
+++ b/c/Mf-i3s2
@ -17,7 +17,7 @@ m = i3s2
 Cpu = I386

 mdclib = -lnsl -ldl -lm -lcurses -lrt
-C = gcc -m32 -Wpointer-arith -Wextra -Werror -O
+C = gcc ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ppc32le
+++ b/c/Mf-ppc32le
@ -17,7 +17,7 @@ m = ppc32le
 Cpu = PPC32

 mdclib = -lm -ldl -lncurses -lrt
-C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS}
 o = o
 mdsrc = ppc32.c
 mdobj = ppc32.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ta6fb
+++ b/c/Mf-ta6fb
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
-C = gcc -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ta6le
+++ b/c/Mf-ta6le
@ -17,7 +17,7 @@ m = ta6le
 Cpu = X86_64

 mdclib = -lm -ldl -lncurses -lpthread -lrt
-C = gcc -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ta6nb
+++ b/c/Mf-ta6nb
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
 mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread
-C = gcc -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ta6ob
+++ b/c/Mf-ta6ob
@ -18,7 +18,7 @@ Cpu = X86_64

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
-C = gcc -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ta6osx
+++ b/c/Mf-ta6osx
@ -17,7 +17,7 @@ m = ta6osx
 Cpu = X86_64

 mdclib = -liconv -lm -lncurses
-C = gcc -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ta6s2
+++ b/c/Mf-ta6s2
@ -17,7 +17,7 @@ m = ta6s2
 Cpu = X86_64

 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt
-C = gcc -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT
+C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
--- a/c/Mf-ti3fb
+++ b/c/Mf-ti3fb
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
-C = gcc -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ti3le
+++ b/c/Mf-ti3le
@ -17,7 +17,7 @@ m = ti3le
 Cpu = I386

 mdclib = -lm -ldl -lncurses -lpthread -lrt
-C = gcc -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ti3nb
+++ b/c/Mf-ti3nb
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
 mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread
-C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -m elf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ti3ob
+++ b/c/Mf-ti3ob
@ -18,7 +18,7 @@ Cpu = I386

 mdinclude = -I/usr/local/include -I/usr/X11R6/include
 mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
-C = gcc -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -35,7 +35,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ti3osx
+++ b/c/Mf-ti3osx
@ -17,7 +17,7 @@ m = ti3osx
 Cpu = I386

 mdclib = -liconv -lm -lncurses
-C = gcc -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-ti3s2
+++ b/c/Mf-ti3s2
@ -17,7 +17,7 @@ m = ti3s2
 Cpu = I386

 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt
-C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
 o = o
 mdsrc = i3le.c
 mdobj = i3le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -melf_i386 -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/c/Mf-tppc32le
+++ b/c/Mf-tppc32le
@ -17,7 +17,7 @@ m = tppc32le
 Cpu = PPC32

 mdclib = -lm -ldl -lncurses -lpthread -lrt
-C = gcc -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread
+C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
 o = o
 mdsrc = ppc32le.c
 mdobj = ppc32le.o
@ -34,7 +34,7 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 	ld -r -X -o ${Kernel} ${kernelobj} ../zlib/libz.a

 ${Scheme}: ${Kernel} ${Main}
-	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib}
+	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}

 ${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
--- a/2
+++ b/2
@ -122,7 +122,7 @@ end

 set sfiles = ()
 foreach x ($tmpsfiles)
-    if ("$x" == "./Makefile" || "$x" == "./Mf-install" || "$x" == "./Mf-boot" || "$x" == "c/config.h") then
+    if ("$x" == "./Makefile" || "$x" == "./Mf-install" || "$x" == "./Mf-boot" || "$x" == "c/config.h" || "$x" == "c/Mf-config") then
        set ignorefiles = ($ignorefiles $x)
    else
        cmp $W/$x $x >& /dev/null
--- a/37
+++ b/37
@ -37,6 +37,9 @@ installman=""
 installschemename="scheme"
 installpetitename="petite"
 installscriptname="scheme-script"
+CPPFLAGS=""
+CFLAGS=""
+LDFLAGS=""

 case `uname` in
  Linux)
@ -178,6 +181,15 @@ while [ $# != 0 ] ; do
    --help)
      help=yes
      ;;
+    CPPFLAGS=*)
+      CPPFLAGS=`echo $1 | sed -e 's/^CPPFLAGS=//'`
+      ;;
+    CFLAGS=*)
+      CFLAGS=`echo $1 | sed -e 's/^CFLAGS=//'`
+      ;;
+    LDFLAGS=*)
+      LDFLAGS=`echo $1 | sed -e 's/^LDFLAGS=//'`
+      ;;
    *)
      echo "option '$1' unrecognized or missing an argument; try $0 --help"
      exit 1
@ -244,6 +256,9 @@ if [ "$help" = "yes" ]; then
  echo "  --installscriptname=<scriptname>  install with group ($installscriptname)"
  echo "  --[no]gzip-man-pages              compress manual pages ($gzipmanpages)"
  echo "  --workarea=<pathname>             build directory ($w)"
+  echo "  CPPFLAGS=<C preprocessor flags>   additional C preprocessor flags ($CPPFLAGS)"
+  echo "  CFLAGS=<C compiler flags>         additional C compiler flags ($CFLAGS)"
+  echo "  LDFLAGS=<linker flags>            additional linker flags ($LDFLAGS)"
  echo ""
  echo "Available machine types: $machs"
  echo ""
@ -273,7 +288,21 @@ if [ "$m" = "" -o ! -f boot/$m/scheme.boot ] ; then
  exit 1
 fi

-git submodule init && git submodule update || exit 1
+if [ -d '.git' ] ; then
+  git submodule init && git submodule update || exit 1
+else
+  if [ ! -f 'nanopass/nanopass.ss' ] ; then
+    rmdir nanopass && (curl  -L -o v1.9.tar.gz https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz && tar -zxf v1.9.tar.gz && mv nanopass-framework-scheme-1.9 nanopass && rm v1.9.tar.gz) || exit 1
+  fi
+
+  if [ ! -f 'zlib/configure' ] ; then
+    rmdir zlib && (curl -L -o v1.2.8.tar.gz https://github.com/madler/zlib/archive/v1.2.8.tar.gz && tar -xzf v1.2.8.tar.gz && mv zlib-1.2.8 zlib && rm v1.2.8.tar.gz) || exit 1
+  fi
+
+  if [ ! -f 'stex/Mf-stex' ] ; then
+    rmdir stex && (curl -L -o v1.2.tar.gz https://github.com/dybvig/stex/archive/v1.2.tar.gz && tar -zxf v1.2.tar.gz && mv stex-1.2 stex && rm v1.2.tar.gz) || exit 1
+  fi
+fi

 ./workarea $m $w

@ -305,3 +334,9 @@ cat > $w/c/config.h << END
 #define SCHEME_SCRIPT "$installscriptname"
 #define DEFAULT_HEAP_PATH "$installlib/csv%v/%m"
 END
+
+cat > $w/c/Mf-config << END
+CPPFLAGS=$CPPFLAGS
+CFLAGS=$CFLAGS
+LDFLAGS=$LDFLAGS
+END
--- a/3
+++ b/3
@ -116,6 +116,9 @@ workdir $W/c
 if [ ! -e $W/c/config.h ] ; then
  touch $W/c/config.h
 fi
+if [ ! -e $W/c/Mf-config ] ; then
+  touch $W/c/Mf-config
+fi

 workdir $W/s
 (cd $W/s; workln ../../s/Mf-$M Mf-$M)