summaryrefslogtreecommitdiff
path: root/editors/scite/patches/patch-aa
blob: d7f5a661e72c88029b3a2b06cb5290ca426c983c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
$NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $

--- gtk/makefile.orig	2013-01-17 01:17:02.000000000 +0000
+++ gtk/makefile
@@ -46,10 +46,10 @@ PROG	= ../bin/SciTE
 
 all: $(PROG)
 
-vpath %.h ../src ../../scintilla/include
+vpath %.h ../src $(prefix)/include/scintilla
 vpath %.cxx ../src
 
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src
 ifdef CHECK_DEPRECATED
 DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
 endif
@@ -73,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ
 
 vpath %.c ../lua/src ../lua/src/lib
 
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I../lua/include
 
 .c.o:
 	$(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
@@ -102,7 +102,7 @@ deps:
 	$(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.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
+COMPLIB=$(prefix)/lib/scintilla.a
 
 $(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 \