Lines 1-31
Link Here
|
1 |
--- config.mk.orig 2007-11-21 21:18:41.000000000 +0100 |
1 |
--- config.mk.orig 2008-03-13 17:55:43.000000000 +0100 |
2 |
+++ config.mk 2007-11-22 16:49:20.000000000 +0100 |
2 |
+++ config.mk 2008-03-14 00:03:22.000000000 +0100 |
3 |
@@ -4,19 +4,19 @@ |
3 |
@@ -4,11 +4,11 @@ |
4 |
# Customize below to fit your system |
4 |
# Customize below to fit your system |
5 |
|
5 |
|
6 |
# paths |
6 |
# paths |
7 |
-PREFIX = /usr/local |
7 |
-PREFIX = /usr/local |
8 |
-MANPREFIX = ${PREFIX}/share/man |
8 |
-MANPREFIX = ${PREFIX}/share/man |
9 |
+PREFIX?= /usr/local |
9 |
+PREFIX ?= /usr/local |
10 |
+MANPREFIX = ${PREFIX}/man |
10 |
+MANPREFIX = ${PREFIX}/man/ |
11 |
|
11 |
|
12 |
-X11INC = /usr/X11R6/include |
12 |
-X11INC = /usr/X11R6/include |
13 |
-X11LIB = /usr/X11R6/lib |
13 |
-X11LIB = /usr/X11R6/lib |
14 |
+X11INC = $(X11BASE)/include |
14 |
+X11INC = ${PREFIX}/include |
15 |
+X11LIB = $(X11BASE)/lib |
15 |
+X11LIB = ${PREFIX}/lib |
16 |
|
16 |
|
17 |
# includes and libs |
17 |
# includes and libs |
18 |
INCS = -I. -I/usr/include -I${X11INC} |
18 |
INCS = -I. -I/usr/include -I${X11INC} |
19 |
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 |
|
|
20 |
|
21 |
# flags |
22 |
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" |
23 |
-LDFLAGS = -s ${LIBS} |
24 |
+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\" |
25 |
+LDFLAGS+= ${LIBS} |
26 |
#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" |
27 |
#LDFLAGS = -g ${LIBS} |
28 |
|
29 |
@@ -26,4 +26,4 @@ |
19 |
@@ -26,4 +26,4 @@ |
30 |
#CFLAGS += -xtarget=ultra |
20 |
#CFLAGS += -xtarget=ultra |