--- Makefile.orig	Wed Sep 12 12:12:02 2001
+++ Makefile	Sat Feb 19 21:19:11 2005
@@ -29,8 +29,8 @@
 
 # Add -lnsl and -lsocket to LIBS in SysV systems 
 #
-CFLAGS=-I/usr/local/include -DQRC=1 -Wall 
-LFLAGS=-L/usr/local/lib
+CFLAGS=-I__PREFIX__/include -DQRC=1 -Wall
+#LFLAGS=-L/usr/local/lib
 LIBS=-lgmp
 
 # Use these and comment the above if you wish to compile dhid without 
@@ -46,10 +46,10 @@
 all:	dhid genkeys
 
 dhid:	conf.o network.o main.o
-	$(CC) $(LFLAGS) -o dhid conf.o network.o main.o $(LIBS)
+	$(CC) $(LDFLAGS) -o dhid conf.o network.o main.o $(LIBS)
 
 genkeys: genkeys.c
-	$(CC) $(CFLAGS) $(LFLAGS) -o genkeys genkeys.c $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genkeys genkeys.c $(LIBS)
 
 main.o: dhid.h main.c
 	$(CC) $(CFLAGS) -c main.c
