kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-6352: --resolve don't override install target when using automake, make your own install target that will get depended upon instead

This commit is contained in:
Michael Jerris 2014-03-13 09:13:48 -04:00
parent de8d92d9ce
commit df8fbb60e8
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/asr_tts/mod_pocketsphinx/Makefile.am
View File

@ -66,5 +66,5 @@ $(DESTDIR)$(grammardir)/model/communicator:
dictionary:
@install -m0644 $(POCKETSPHINX_DIR)/model/lm/en_US/cmu07a.dic $(DESTDIR)$(grammardir)/default.dic
install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary
install-data-local: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary

2
src/mod/endpoints/mod_khomp/Makefile.am
View File

@ -29,7 +29,7 @@ verbose_traits.hpp verbose_traits.cpp:
bash ./commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\
fi;
install:
install-data-local:
@if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \
echo "###############################################################################" ;\
echo "Install k3l from KHOMP." ;\

2
src/mod/languages/mod_java/Makefile.am
View File

@ -28,6 +28,6 @@ reswig:
rm -f switch_swig_wrap.cpp
swig -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i
install:
install-data-local:
cp freeswitch.jar $(DESTDIR)@scriptdir@

2
src/mod/languages/mod_managed/Makefile.am
View File

@ -20,7 +20,7 @@ reswig: swigclean freeswitch_wrap.cxx
local_depend:
cd managed && $(MAKE)
install: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN)
install-data-local: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN)
mkdir -p $(DESTDIR)$(modulesdir)/managed
cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install

2
src/mod/languages/mod_perl/Makefile.am
View File

@ -37,7 +37,7 @@ BUILT_SOURCE=freeswitch.$(LIBTOOL_LIB_EXTEN)
clean:
rm -fr *~ .perlok .libs freeswitch.$(LIBTOOL_LIB_EXTEN) 2>/dev/null
install:
install-data-local:
mkdir -p $(DESTDIR)$(prefix)/perl
$(LTINSTALL) freeswitch.$(LIBTOOL_LIB_EXTEN) freeswitch.pm $(DESTDIR)$(prefix)/perl
if [ ! -f $(DESTDIR)$(prefix)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(DESTDIR)$(prefix)/perl ; fi

2
src/mod/languages/mod_python/Makefile.am
View File

@ -24,7 +24,7 @@ mod_python_wrap.cpp: mod_python_extra.c hack.diff
which swig 2>&1 >>/dev/null && echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
which swig 2>&1 >>/dev/null && patch -s -p0 -i hack.diff
install:
install-data-local:
mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR)
cp -f freeswitch.py $(DESTDIR)$(PYTHON_SITE_DIR)