--- src/Makefile.orig	2013-07-07 02:00:52.000000000 -0700
+++ src/Makefile	2013-08-03 11:35:03.000000000 -0700
@@ -39,13 +39,13 @@
   $(error HOST is undefined)
 endif
 
-DEFINES=-D$(HOST)	# -DSLASHSLASH -DNETWORK_EXTENSIONS -DNOFLOAT -DCLOSURES -DCO_THROTTLE=50
+DEFINES=-D$(HOST) $(EXTRA_DEFINES)	# -DSLASHSLASH -DNETWORK_EXTENSIONS -DNOFLOAT -DCLOSURES -DCO_THROTTLE=50
 DEBUG=	-O -g
-CCFLAGS=$(DEFINES) $(DEBUG)
+CCFLAGS=$(DEFINES)
 CFLAGS=	-I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS)
 LDFLAGS=
 LIBS=	-ldl
-CC=	gcc
+CC?=	gcc
 LD=	$(CC)
 YACC=	yacc
 BIN=	../bin
@@ -64,6 +64,8 @@
 COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o sdata.o data.o \
 	interpret.o config.o ext.o
 
+all: a.out comp/a.out
+
 a.out:	$(OBJ) comp/dgd lex/dgd ed/dgd parser/dgd kfun/dgd lpc/dgd host/dgd
 	$(LD) $(DEBUG) $(LDFLAGS) -o $@ $(OBJ) `cat comp/dgd` `cat lex/dgd` \
 	      `cat ed/dgd` `cat parser/dgd` `cat kfun/dgd` `cat lpc/dgd` \
@@ -94,10 +96,15 @@
 all:	a.out
 
 $(BIN)/driver: a.out
+	-mkdir $(BIN)
 	-mv $(BIN)/driver $(BIN)/driver.old
 	cp a.out $(BIN)/driver
 
-install: $(BIN)/driver
+$(BIN)/precomp: comp/a.out
+	-mv $(BIN)/precomp $(BIN)/precomp.old
+	cp comp/a.out $(BIN)/precomp
+
+install: $(BIN)/driver $(BIN)/precomp
 
 comp.sub: $(COMPOBJ)
 	@for i in $(COMPOBJ); do echo ../$$i; done > comp.sub
@@ -107,7 +114,8 @@
 
 comp/a.out:
 	cd comp; $(MAKE) 'CC=$(CC)' 'HOST=$(HOST)' 'CCFLAGS=$(CCFLAGS)' \
-			 'YACC=$(YACC)' 'LIBS=$(LIBS)' a.out
+			 'LDFLAGS=$(LDFLAGS)' 'YACC=$(YACC)' 'LIBS=$(LIBS)' \
+			 a.out
 
 clean:
 	rm -f a.out $(OBJ) comp.sub lex.sub ed.sub