From 7e8a9d0995ddb5d7013f1e43e7351e89878e185d Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 24 Nov 2009 00:08:40 +0000 Subject: [PATCH] fix regression from r15645 (FSBUILD-211) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15647 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b1b3186f64..20540cb660 100644 --- a/Makefile.am +++ b/Makefile.am @@ -192,22 +192,22 @@ fs_ivrd_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h -fs_cli_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)libs/esl/src/include +fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) -fs_ivrd_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)libs/esl/src/include +fs_ivrd_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la if ADD_LIBEDIT -fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(top_srcdir)libs/libedit/src +fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(switch_srcdir)/libs/libedit/src fs_cli_LDADD = libs/libedit/src/.libs/libedit.a freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT freeswitch_LDADD += libs/libedit/src/.libs/libedit.a endif if ADD_LIBEDIT -CORE_CFLAGS += -I$(top_srcdir)libs/libedit/src -DSWITCH_HAVE_LIBEDIT +CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT CORE_LIBS += libs/libedit/src/.libs/libedit.a endif