feed prefix dir from configure instead of makefile to clean up the compile line. Make the code more consistant between windows and *nix builds. You will likely need to re configure after getting this update.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4509 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
178a333539
commit
e24008643e
10
Makefile.in
10
Makefile.in
|
@ -340,15 +340,7 @@ CORE_INCLUDES = -I$(PWD)/libs/apr/include \
|
|||
-I$(PWD)/libs/libresample/include \
|
||||
-I$(PWD)/libs/libteletone/src
|
||||
CORE_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
|
||||
$(shell $(APU_CONFIG) --includes) \
|
||||
-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
|
||||
-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
|
||||
-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
|
||||
-DSWITCH_DB_DIR=\"$(PREFIX)/db\" \
|
||||
-DSWITCH_LOG_DIR=\"$(PREFIX)/log\" \
|
||||
-DSWITCH_SCRIPT_DIR=\"$(PREFIX)/scripts\" \
|
||||
-DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\" \
|
||||
-DSWITCH_GRAMMAR_DIR=\"$(PREFIX)/grammar\"
|
||||
$(shell $(APU_CONFIG) --includes)
|
||||
CORE_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(shell \
|
||||
$(APU_CONFIG) --link-ld --libs )
|
||||
lib_LTLIBRARIES = libfreeswitch.la
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -9,7 +9,7 @@
|
|||
#define SWITCH_SSIZE_T @ssize_t_value@
|
||||
|
||||
#define SWITCH_SIZEOF_VOIDP @voidp_size@
|
||||
#define SWITCH_PREFIX_DIR @prefix@
|
||||
#define SWITCH_PREFIX_DIR "@prefix@"
|
||||
|
||||
@ssize_t_fmt@
|
||||
@size_t_fmt@
|
||||
|
|
Loading…
Reference in New Issue