提交 e2400864 authored 作者: Michael Jerris's avatar Michael Jerris

feed prefix dir from configure instead of makefile to clean up the compile line.…

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
上级 178a3335
......@@ -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
......
This source diff could not be displayed because it is too large. You can view the blob instead.
差异被折叠。
差异被折叠。
......@@ -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@
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论