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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- tecmake.mak.orig 2015-04-30 04:20:54.000000000 +0200
+++ tecmake.mak 2015-05-19 12:53:18.852399934 +0200
@@ -916,12 +916,12 @@
endif
ifdef USE_LUA
- LUA_LIB ?= $(LUA)/lib/$(TEC_UNAME_LIB_DIR)
+ LUA_LIB ?= /usr/lib
ifdef USE_STATIC
ifndef NO_LUALIB
SLIB += $(LUA_LIB)/liblualib$(LUA_SUFFIX).a
endif
- SLIB += $(LUA_LIB)/liblua$(LUA_SUFFIX).a
+ SLIB += $(LUA_LIB)/liblua.a
else
ifndef NO_LUALIB
LIBS += lualib$(LUA_SUFFIX)
@@ -931,7 +931,7 @@
LDIR += $(LUA_LIB)
else
ifneq ($(findstring cygw, $(TEC_UNAME)), )
- LIBS += lua$(LUA_SUFFIX)
+ LIBS += lua
LDIR += $(LUA_LIB)
endif
endif
@@ -1040,7 +1040,7 @@
LINK_CAIRO = Yes
endif
- SLIB += $(CD_LIB)/libcd$(CD_SUFFIX).a
+ SLIB += /usr/lib/libcd.a
else
ifdef USE_XRENDER
CHECK_XRENDER = Yes
@@ -1075,7 +1075,7 @@
LINK_FREETYPE = Yes
- CD_INC ?= $(CD)/include
+ CD_INC ?= /usr/include/cd
INCLUDES += $(CD_INC)
endif
@@ -1087,13 +1087,13 @@
endif
ifdef USE_STATIC
- SLIB += $(IM_LIB)/libim.a
+ SLIB += /usr/lib/libim.a
else
LIBS += im
LDIR += $(IM_LIB)
endif
- IM_INC ?= $(IM)/include
+ IM_INC ?= /usr/include/im
INCLUDES += $(IM_INC)
endif
@@ -1134,7 +1134,7 @@
ZLIB_LIB = $(CD_LIB)
endif
- SLIB += $(ZLIB_LIB)/lib$(ZLIB).a
+ SLIB += /usr/lib/libz.a
else
LIBS += $(ZLIB)
endif
@@ -1292,7 +1292,7 @@
endif
ifdef USE_X11
- LIBS += $(X11_LIBS)
+ LIBS += $(X11_LIBS) fontconfig
LDIR += $(X11_LIB)
STDINCS += $(X11_INC)
endif
|