--- makefile.orig	Wed Dec 24 08:44:58 2003
+++ makefile	Sun Jan 11 19:47:08 2004
@@ -5,7 +5,7 @@
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
 
 .SUFFIXES: .cxx .o .h .a
-CC = g++
+CC ?= g++
 AR = ar
 
 # If explicit setting of GTK1 or GTK2 then use that else look for
@@ -27,9 +27,9 @@
 CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
 gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
 else
-CONFIGFLAGS=gtk-config --cflags
-CONFIGLIB=gtk-config --libs
-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread
+CONFIGLIB=pkg-config --libs gtk+ gthread
+gnomeprefix:=$(PREFIX)
 endif
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
@@ -43,17 +43,17 @@
 
 PROG	= ../bin/SciTE
 
-vpath %.h ../src ../../scintilla/include
+vpath %.h ../src $(X11BASE)/include/scintilla
 vpath %.cxx ../src
 
 #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
 CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
 
 ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
 else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
 endif
 
 ifeq ($(shell uname), Darwin)
@@ -75,8 +75,8 @@
 COMPLIB=../../scintilla/bin/scintilla.a
 
 $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
-MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o $(COMPLIB)
-	$(CC) `$(CONFIGLIB)` `glib-config --libs gthread` -DGTK $^ -o $@
+MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o
+	$(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers -DGTK $^ -o $@
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak
