mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-24 13:12:03 +00:00
Make libdir and bindir being accepted by libs and modules
add a setting called --modinstdir to be able to define where modules get installed git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7663 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -39,4 +39,3 @@ $(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update
|
||||
|
||||
../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA)
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s`
|
||||
# Dirty trick to override the link output
|
||||
LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi
|
||||
|
||||
moddir=$(prefix)/mod
|
||||
moddir=@modinstdir@
|
||||
|
||||
MODNAME=mod_sofia
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@ LOCAL_LIBADD=
|
||||
|
||||
include sm.mak
|
||||
|
||||
depend_install: $(DESTDIR)$(PREFIX)/lib/libjs.la
|
||||
depend_install: $(DESTDIR)$(libdir)/libjs.la
|
||||
|
||||
$(DESTDIR)$(PREFIX)/lib/libjs.la: $(JSLA)
|
||||
$(DESTDIR)$(libdir)/libjs.la: $(JSLA)
|
||||
cd $(JS_DIR)/nsprpub/ && $(MAKE) install
|
||||
cd $(JS_DIR) && $(MAKE) install
|
||||
|
||||
|
||||
Reference in New Issue
Block a user