1 --- a/modules/carrierroute/Makefile
2 +++ b/modules/carrierroute/Makefile
3 @@ -12,10 +12,8 @@ NAME=carrierroute.so
4 BUILDER = $(shell which confuse-config)
7 - CONFUSEDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
9 - CONFUSELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
10 - -L/opt/lib -lconfuse
11 + CONFUSEDEFS=-I$(LOCALBASE)/include
12 + CONFUSELIBS=-L$(LOCALBASE)/lib
14 CONFUSEDEFS = $(shell confuse-config --cflags)
15 CONFUSELIBS = $(shell confuse-config --libs)
16 --- a/modules/h350/Makefile
17 +++ b/modules/h350/Makefile
18 @@ -9,6 +9,8 @@ include ../../Makefile.defs
24 +DEFS+=-I$(LOCALBASE)/include
25 +LIBS=-L$(LOCALBASE)/lib -lldap
27 include ../../Makefile.modules
28 --- a/modules/identity/Makefile
29 +++ b/modules/identity/Makefile
30 @@ -9,7 +9,7 @@ include ../../Makefile.defs
34 -DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/ssl/include
35 -LIBS= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -L/usr/sfw/lib -L/usr/local/ssl/lib -lssl -lcrypto
36 +DEFS+= -I$(LOCALBASE)/include
37 +LIBS= -L$(LOCALBASE)/lib -lssl -lcrypto
39 include ../../Makefile.modules
40 --- a/modules/ldap/Makefile
41 +++ b/modules/ldap/Makefile
42 @@ -12,7 +12,8 @@ include ../../Makefile.defs
47 +DEFS+=-I$(LOCALBASE)/include
48 +LIBS=-L$(LOCALBASE)/lib -lldap
51 DEFS+=-I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/include -I/opt/sfw/include -I/opt/csw/include
52 --- a/modules/pua_bla/Makefile
53 +++ b/modules/pua_bla/Makefile
54 @@ -9,8 +9,8 @@ include ../../Makefile.defs
58 -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
59 -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2
60 +DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
61 +LIBS+=-L$(LOCALBASE)/lib -lxml2
63 include ../../Makefile.modules
65 --- a/modules/pua_xmpp/Makefile
66 +++ b/modules/pua_xmpp/Makefile
67 @@ -10,7 +10,7 @@ auto_gen=
71 -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
72 -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2
73 +DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
74 +LIBS+=-L$(LOCALBASE)/lib -lxml2
76 include ../../Makefile.modules
77 --- a/modules/regex/Makefile
78 +++ b/modules/regex/Makefile
79 @@ -20,8 +20,8 @@ ifneq ($(PCRECFG),)
83 - DEFS+=-I/usr/include -I/usr/sfw/include -I/usr/local/include -I/opt/csw/include -I$(LOCALBASE)/include
84 - LIBS=-I/usr/lib -I/usr/sfw/lib -I/usr/local/lib -I/opt/csw/lib -I$(LOCALBASE)/lib -lpcre
85 + DEFS+=-I$(LOCALBASE)/include
86 + LIBS=-L$(LOCALBASE)/lib -lpcre
90 --- a/modules/tlsops/Makefile
91 +++ b/modules/tlsops/Makefile
92 @@ -7,8 +7,8 @@ auto_gen=
96 -DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/ssl/include
97 -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -L/usr/sfw/lib -L/usr/local/ssl/lib -lssl -lcrypto
98 +DEFS+= -I$(LOCALBASE)/include
99 +LIBS+= -L$(LOCALBASE)/lib -lssl -lcrypto
101 include ../../Makefile.modules