--- Makefile.old
+++ Makefile
@@ -1,32 +1,38 @@
-CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS)
-OFLAGS = -O3 -DNDEBUG
-#OFLAGS = -pg
+CC ?= gcc
+CFLAGS += -Wall
+
+DEBUG ?= 0
+
+ifeq ($(DEBUG), 1)
+CFLAGS += -g -O3 -DNDEBUG
+endif
 
 OBJS = tree.o compile.o
 
 all : peg leg
 
 peg : peg.o $(OBJS)
-	$(CC) $(CFLAGS) -o $@-new peg.o $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@-new peg.o $(OBJS)
 	mv $@-new $@
 
 leg : leg.o $(OBJS)
-	$(CC) $(CFLAGS) -o $@-new leg.o $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@-new leg.o $(OBJS)
 	mv $@-new $@
 
-ROOT	=
-PREFIX	= /usr/local
-BINDIR	= $(ROOT)$(PREFIX)/bin
+PREFIX	?= /usr/local
+BINDIR	?= $(PREFIX)/bin
 
-install : $(BINDIR)/peg $(BINDIR)/leg
+INSTALL ?= install
+INSTALL_PROG ?= $(INSTALL) -m755
 
-$(BINDIR)/% : %
-	cp -p $< $@
-	strip $@
+install : all
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROG) peg $(DESTDIR)$(BINDIR)/peg
+	$(INSTALL_PROG) leg $(DESTDIR)$(BINDIR)/leg
 
 uninstall : .FORCE
-	rm -f $(BINDIR)/peg
-	rm -f $(BINDIR)/leg
+	rm -f $(DESTDIR)$(BINDIR)/peg
+	rm -f $(DESTDIR)$(BINDIR)/leg
 
 peg.o : peg.c peg.peg-c