$OpenBSD: patch-gtk_makefile,v 1.3 2007/08/01 09:21:07 steven Exp $
--- gtk/makefile.orig	Thu Jun 14 17:37:56 2007
+++ gtk/makefile	Wed Jun 20 11:14:35 2007
@@ -26,26 +26,26 @@ ifdef GTK2
 CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
 CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
 CONFIGTHREADS=
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+#gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
 else
 CONFIGFLAGS=$(shell gtk-config --cflags)
 CONFIGLIB=$(shell gtk-config --libs)
 CONFIGTHREADS=$(shell glib-config --libs gthread)
-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
 endif
 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
 else
-  prefix=/usr
+  prefix=$(PREFIX)
 endif
 endif
 datadir=$(prefix)/share
 pixmapdir=$(datadir)/pixmaps
 bindir=$(prefix)/bin
 SYSCONF_PATH=$(prefix)/share/scite
+DOC_PATH=$(prefix)/share/doc/scite
 
-INSTALL=install -o root -g root
+INSTALL=install -o root -g bin 
 
 PROG	= ../bin/SciTE
 
@@ -55,16 +55,18 @@ vpath %.h ../src ../../scintilla/include
 vpath %.cxx ../src
 
 #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
-CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I $(prefix)/include
+CXXBASEFLAGS=-W -Wall -pedantic -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
 
 ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
 else
-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
 endif
 
-ifndef NO_LUA
+LIBS= -L $(prefix)/lib -lscintilla -lscintilla_lexers
+
+ifdef LUA
 LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
 		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
 		ltable.o ltm.o lundump.o lvm.o lzio.o
@@ -74,14 +76,14 @@ LUA_LIB_OBJS =	lauxlib.o lbaselib.o ldblib.o liolib.o 
 
 LUA_OBJS = LuaExtension.o IFaceTable.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
 
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+INCLUDEDIRS+=-I../lua/include
 $(LUA_CORE_OBJS): ../lua/src/*.c
 	gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
 $(LUA_LIB_OBJS): ../lua/src/lib/*.c
 	gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
-CXXFLAGS=$(CXXTFLAGS)
+CXXFLAGS+=$(CXXTFLAGS)
 else
-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
 endif
 
 ifeq ($(shell uname), Darwin)
@@ -89,21 +91,18 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
 endif
 
 .cxx.o:
-	$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(CXX) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
 
 clean:
 	rm -f *.o $(PROG)
 
 deps:
-	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+	$(CXX) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
 
-# make should be run in ../../scintilla/gtk to compile all the lexers.
-COMPLIB=../../scintilla/bin/scintilla.a
-
 $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
 MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
 	$(COMPLIB) $(LUA_OBJS)
-	$(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
+	$(CXX) $(CONFIGTHREADS) $(LIBS) -DGTK $^ -o $@ $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak
@@ -112,22 +111,20 @@ include deps.mak
 # This is OK - just means no SciTE in the Gnome Applications menu
 # Dead:	install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
 install:
-	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
+	$(INSTALL) -m 755 -d $(bindir) $(SYSCONF_PATH)
 
-	$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 $(PROG) $(bindir)
+	$(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH) 
+	$(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH)
+	$(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png $(DOC_PATH)
 
-	for files in ../src/*.properties ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
-	do \
-		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
-	done
-
 ifdef gnomeprefix
 ifdef GTK2
 	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
 else
 	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
 endif
-	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+	$(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
 endif
 
 uninstall:
