diff options
Diffstat (limited to 'editors/scite/files/patch-aa')
| -rw-r--r-- | editors/scite/files/patch-aa | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index 771f0bf574ad..93e97f1594a4 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,9 +1,9 @@ $FreeBSD$ ---- makefile.orig Sun Nov 12 09:51:48 2000 -+++ makefile Wed Jan 10 15:11:52 2001 -@@ -10,27 +10,27 @@ +--- makefile.orig Tue Jan 30 02:53:22 2001 ++++ makefile Tue Jan 30 11:24:28 2001 +@@ -10,37 +10,38 @@ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. # "h@h@" is printed here when gnome-config unavailable. Seems harmless. @@ -32,31 +32,37 @@ $FreeBSD$ #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings -INCLUDEDIRS=-I ../../scintilla/include -I ../src +-CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(SINGLEINSTANCE) -W -Wall +INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src - CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(SINGLEINSTANCE) -W -Wall ++CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" \ ++ $(SINGLEINSTANCE) -W -Wall $(shell $(GTK_CONFIG) --cflags) ifdef DEBUG -@@ -40,7 +40,7 @@ +-CXXFLAGS=-DDEBUG $(CXXBASEFLAGS) ++CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS) + else +-CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) ++CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) endif .cxx.o: - $(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ -+ $(CC) `$(GTK_CONFIG) --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ ++ $(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ all: $(PROG) -@@ -57,8 +57,8 @@ +@@ -57,8 +58,8 @@ ../../scintilla/gtk/LexVB.o $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \ -SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS) - $(CC) `gtk-config --libs` -DGTK $^ -o $@ +SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS) -+ $(CC) `$(GTK_CONFIG) --libs` -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers ++ $(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers # SciTE-static no longer builds. Kept here in case of later need. SciTE-static: SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o SciTEProps.o \ -@@ -85,12 +85,12 @@ +@@ -85,12 +86,12 @@ # This is OK - just means no SciTE in the Gnome Applications menu # Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties install: |