--- makefile.orig	2013-02-18 02:21:10.000000000 -0500
+++ makefile	2013-02-26 18:30:59.000000000 -0500
@@ -5,13 +5,6 @@
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
 
 .SUFFIXES: .cxx .o .h .a .c
-ifdef CLANG
-CC = clang --std=c++0x
-CCOMP = clang -Wno-empty-body
-else
-CC = g++
-CCOMP = gcc
-endif
 AR = ar
 
 ifdef GTK3
@@ -24,7 +17,7 @@
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
 CONFIGTHREADS:=
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
+gnomeprefix:=$(PREFIX)
 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
@@ -109,8 +102,9 @@
 $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
 FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
-	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
+	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
+	-o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak