--- Makefile.orig Mon Apr 17 21:40:11 2006 +++ Makefile Mon Aug 7 13:22:22 2006 @@ -1,11 +1,6 @@ # Makefile for luadfui. # $Id: Makefile,v 1.13 2005/08/26 22:44:37 cpressey Exp $ -BASE?=../../.. -include ${BASE}/Config - -LUA=../../../platform/lua - COMPAT?=../compat-5.1 COMPATOBJ=${COMPAT}/compat-5.1.o @@ -13,12 +8,11 @@ OBJS= common.o dfui.o progress.o CFLAGS+= ${WARNS} -fPIC -CFLAGS+= -I${LUA}/include -I${COMPAT} -I../../libdfui -CFLAGS+= -I/usr/local/include -I/usr/pkg/include +CFLAGS+= -I${COMPAT} -I${LOCALBASE}/include/dfui4 +CFLAGS+= -I${LUA_INCDIR} CFLAGS+= ${EXTRA_CFLAGS} -LDFLAGS+= -L../../libdfui -L../../libaura -L${LUA}/lib/ -LDFLAGS+= -L/usr/local/lib -L/usr/pkg/lib -LDFLAGS+= -ldfui -laura -lm -llua50 -llualib50 +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} +LDFLAGS+= -ldfui4 -laura3 -lm -llua -llualib all: ${LIB}