fix include paths and makefiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4559 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile
index 40b9f43a24bfe205f7e46053dd371da4f252bca4..42550dfa19f9060985276b87b927ab994ca0bb30 100644 (file)
--- a/src/mod/directories/mod_ldap/Makefile
+++ b/src/mod/directories/mod_ldap/Makefile
@@ -10,11 +10,11 @@ depends:
        MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak
index bc22d30933bb5eb111015ef9590372e6f823d6f3..c4bd51d84b532ce99fd9ab6ede89ae49d69dbe24 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/sm.mak
+++ b/src/mod/languages/mod_spidermonkey/sm.mak
@@ -1,2 +1,2 @@
-CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/include -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
+CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr  -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
 LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la

diff --git a/src/mod/languages/mod_spidermonkey_teletone/Makefile b/src/mod/languages/mod_spidermonkey_teletone/Makefile
index da921497eab2eb7c34305dc66c0482d8e6d957bd..077defc2cc3b63b4196612e12bf83ba0a85efc25 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/Makefile
+++ b/src/mod/languages/mod_spidermonkey_teletone/Makefile
@@ -1,4 +1,5 @@
 include ../mod_spidermonkey/sm.mak
+CFLAGS+=-I$(BASE)/libs/libteletone/src
 LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)