--- src/makefile	Wed Oct  5 22:14:22 2011
+++ src/makefile.new	Sun Oct 23 12:58:49 2011
@@ -12,11 +12,11 @@
 
 # See src/gui-qt/highlight.pro for the Qt GUI compilation options
 
-CXX=c++
+#CXX=c++
 
 QMAKE=qmake
 
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
 #CFLAGS:=-ggdb ${CFLAGS}
 
 CFLAGS_DILU=-fno-strict-aliasing
@@ -33,7 +33,7 @@
 INCLUDE_DIR=./include/
 
 # Lua paths
-LUA_CFLAGS=-I/usr/include/lua5.1
+LUA_CFLAGS=-I${LOCALBASE}/include
 LUA_LIBS=-llua
 #LUA_CFLAGS=$(shell pkg-config --cflags lua5.1)
 #LUA_LIBS=$(shell pkg-config --libs lua5.1)
@@ -45,10 +45,10 @@
 DILU_DIR=${CORE_DIR}Diluculum/
 
 ifndef HL_CONFIG_DIR
-	HL_CONFIG_DIR = /etc/highlight/
+	HL_CONFIG_DIR = ${SYSCONFDIR}/highlight/
 endif
 ifndef HL_DATA_DIR
-	HL_DATA_DIR = /usr/share/highlight/
+	HL_DATA_DIR = ${PREFIX}/share/highlight/
 endif
 ifdef PIC
 	CFLAGS+=-fPIC