--- config.orig	Sun Oct 14 12:44:03 2007
+++ config	Sun Oct 14 13:54:39 2007
@@ -18,11 +18,13 @@
 #LUAINC=-I/usr/local/include/lua50
 #LUAINC=-I/usr/local/include/lua5.1
 #LUAINC=-Ilua-5.1.1/src
+LUAINC=-I$(LUA_INCDIR)
 
 #------
 # Compat-5.1 directory
 #
 #COMPAT=compat-5.1r5
+COMPAT=${COMPATDIR}
 
 #------
 # Top of your Lua installation
@@ -30,11 +32,11 @@
 #
 #INSTALL_TOP_SHARE=/usr/local/share/lua/5.0
 #INSTALL_TOP_LIB=/usr/local/lib/lua/5.0
-INSTALL_TOP_SHARE=/usr/local/share/lua/5.1
-INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
+INSTALL_TOP_SHARE=${LUA_MODSHAREDIR}
+INSTALL_TOP_LIB=${LUA_MODLIBDIR}
 
-INSTALL_DATA=cp
-INSTALL_EXEC=cp
+INSTALL_DATA=${BSD_INSTALL_DATA}
+INSTALL_EXEC=${BSD_INSTALL_PROGRAM}
 
 #------
 # Compiler and linker settings
@@ -49,11 +51,11 @@
 #------
 # Compiler and linker settings
 # for Linux
-CC=gcc
+CC?=gcc
 DEF=-DLUASOCKET_DEBUG 
-CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
-LDFLAGS=-O -shared -fpic
-LD=gcc 
+CFLAGS+= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
+LDFLAGS+=-O -shared -fpic
+LD=${CC}
 
 #------
 # End of makefile configuration