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 committed 2014-03-13 09:13:56 -04:00
1 parent de8d92d9ce
commit df8fbb60e8
6 files changed
+6 -6

No files matched your search

+1 -1
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@
+1 -1
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
+1 -1
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
+1 -1
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)