--- a/Makefile	2010-07-17 14:20:07.000000000 -0400
+++ b/Makefile	2010-07-17 18:50:30.000000000 -0400
@@ -1,10 +1,7 @@
-CC?=gcc
-INCLUDES?=-I/usr/local/include
-LIBDIRS?=-L/usr/local/lib
-CFLAGS?=-std=c99 -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -Wall -g $(INCLUDES)
-LIB?=-lz -lcrypto
-LEX?=flex
-YACC?=yacc
+CC := gcc
+LIBS := -lssl -lz -lcrypto
+LEX := flex
+YACC := yacc
 
 PREFIX?=/usr
 TINCDIR?=/etc/tinc
@@ -21,10 +18,10 @@
 GITDEBVERSION=$(shell debian/scripts/calcdebversion )
 
 $(NAME): main.o $(OBJ) $(HEADERS)
-	$(CC) -o $@ main.o $(OBJ) $(LIB) $(LIBDIRS)
+	$(CC) $(COPT) -o $@ main.o $(OBJ) $(LIBS) $(LIB)
 
 %.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -o $(patsubst %.c,%.o,$<) -c $<
+	$(CC) $(COPT) -o $(patsubst %.c,%.o,$<) -c $<
 
 lex.yy.o: lex.yy.c y.tab.h