|
Lines 1-5
Link Here
|
| 1 |
--- makefile.old 2008-05-01 09:40:28.000000000 -0400 |
1 |
--- makefile.orig 2009-08-12 21:39:59.000000000 -0400 |
| 2 |
+++ makefile 2008-10-19 12:49:42.000000000 -0400 |
2 |
+++ makefile 2009-08-21 02:04:44.000000000 -0400 |
| 3 |
@@ -5,7 +5,7 @@ |
3 |
@@ -5,7 +5,7 @@ |
| 4 |
# GNU make does not like \r\n line endings so should be saved to CVS in binary form. |
4 |
# GNU make does not like \r\n line endings so should be saved to CVS in binary form. |
| 5 |
|
5 |
|
|
Lines 10-23
Link Here
|
| 10 |
|
10 |
|
| 11 |
# If explicit setting of GTK1 or GTK2 then use that else look for |
11 |
# If explicit setting of GTK1 or GTK2 then use that else look for |
| 12 |
@@ -26,7 +26,7 @@ |
12 |
@@ -26,7 +26,7 @@ |
| 13 |
CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0) |
13 |
CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) |
| 14 |
CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0) |
14 |
CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0) |
| 15 |
CONFIGTHREADS= |
15 |
CONFIGTHREADS:= |
| 16 |
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null) |
16 |
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null) |
| 17 |
+gnomeprefix:=$(PREFIX) |
17 |
+gnomeprefix:=$(PREFIX) |
| 18 |
else |
18 |
else |
| 19 |
CONFIGFLAGS=$(shell gtk-config --cflags) |
19 |
CONFIGFLAGS:=$(shell gtk-config --cflags) |
| 20 |
CONFIGLIB=$(shell gtk-config --libs) |
20 |
CONFIGLIB:=$(shell gtk-config --libs) |
| 21 |
@@ -76,12 +76,12 @@ |
21 |
@@ -76,12 +76,12 @@ |
| 22 |
|
22 |
|
| 23 |
INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include |
23 |
INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include |