diff -r 666e22848890 -r fe861de7a4fc util-src/Makefile
--- a/util-src/Makefile	Fri Nov 28 19:24:08 2008 +0100
+++ b/util-src/Makefile	Sat Nov 29 11:24:59 2008 +0100
@@ -1,13 +1,15 @@
+
+include ../config.unix
+
+LUA_SUFFIX?=5.1
+LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX)
+LUA_LIB?=lua$(LUA_SUFFIX)
+IDN_LIB?=idn
+OPENSSL_LIB?=ssl
 
 
-LUA_INCLUDE=/usr/include/lua51
-LUA_LIB=lua5.1
-
-IDN_LIB=idn
-OPENSSL_LIB=ssl
 
 all: encodings.so hashes.so
-	
 
 install: encodings.so hashes.so
 	strip *.so
@@ -15,11 +17,12 @@
 	
 
 clean:
-	rm *.so
+	rm -f *.so
+	rm -f ../util/*.so
 
 encodings.so: encodings.c
-	gcc -shared encodings.c -I$(LUA_INCLUDE) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so
+	gcc -shared encodings.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so
 
 hashes.so: hashes.c
-	gcc -shared hashes.c -I$(LUA_INCLUDE) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so
+	gcc -shared hashes.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so