From 40ab309b0e2827a72b717de174daad2fe553848a Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 26 Jun 2017 23:52:45 +0200 Subject: [PATCH 1/4] freeswitch-stable: Refresh patch Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/patches/120-fix-copts.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/freeswitch-stable/patches/120-fix-copts.diff b/net/freeswitch-stable/patches/120-fix-copts.diff index a8ca5d0..2959db4 100644 --- a/net/freeswitch-stable/patches/120-fix-copts.diff +++ b/net/freeswitch-stable/patches/120-fix-copts.diff @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1959,7 +1959,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) +@@ -1953,7 +1953,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) From 4938176da18950f7dec334e83574513ee3fe5c11 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 27 Jun 2017 18:20:39 +0200 Subject: [PATCH 2/4] freeswitch-stable: Fix mod_pocketsphinx build - The builds currently fail with "undefined reference" errors. Fix that by turning off Pulseaudio support. Also turn of Jack support in case that gets detected in the future. - aarch64 fails because this arch isn't recognized by the pocketsphinx build system. Fix that by running autoreconf in the pocketsphinx build dirs. - Fix CFLAGS while we're here. - Add dep on libsamplerate to mod_pocketsphinx. If it gets detected it will be linked against, there is no switch to prevent that. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 2 +- .../patches/190-mod_pocketsphinx.patch | 20 +++++++++++++++++++ .../190-mod_pocketsphix-remove-alsa-dep.patch | 11 ---------- 3 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 net/freeswitch-stable/patches/190-mod_pocketsphinx.patch delete mode 100644 net/freeswitch-stable/patches/190-mod_pocketsphix-remove-alsa-dep.patch diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 9a78dfb..c97fb2b 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -957,7 +957,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,opus,Opus,Opus codec support.,+libopus) $(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media recording with the Oreka cross-platform\naudio stream recording and retrieval system.,)) $(eval $(call Package/$(PKG_NAME)/Module,perl,Perl,This package contains mod_perl for FreeSWITCH.,@PERL_THREADS PACKAGE_$(PKG_NAME)-mod-perl:perl +libdb47 +libgdbm)) $(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,)) -$(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,)) +$(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,+libsamplerate)) # When libsamplerate is found it'll be linked against, there is no switch to turn it off $(eval $(call Package/$(PKG_NAME)/Module,posix_timer,POSIX timer,Add POSIX timer support.,)) $(eval $(call Package/$(PKG_NAME)/Module,prefix,Prefix match,This module provides a data store with fast lookups by the longest\nprefix match rule.,)) $(eval $(call Package/$(PKG_NAME)/Module,python,Python,Python support module.,+python-light)) diff --git a/net/freeswitch-stable/patches/190-mod_pocketsphinx.patch b/net/freeswitch-stable/patches/190-mod_pocketsphinx.patch new file mode 100644 index 0000000..dd31403 --- /dev/null +++ b/net/freeswitch-stable/patches/190-mod_pocketsphinx.patch @@ -0,0 +1,20 @@ +--- a/src/mod/asr_tts/mod_pocketsphinx/Makefile.am ++++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile.am +@@ -27,7 +27,7 @@ $(SPHINXBASE_DIR): + + $(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR) + mkdir -p $(SPHINXBASE_BUILDDIR) +- (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=) ++ (cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" $(SPHINXBASE_DIR)/configure ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python) + $(TOUCH_TARGET) + + $(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile +@@ -45,7 +45,7 @@ $(POCKETSPHINX_DIR): + + $(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) + mkdir -p $(POCKETSPHINX_BUILDDIR) +- (cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=-Wno-return-type) ++ (cd $(POCKETSPHINX_BUILDDIR) && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR)) + $(TOUCH_TARGET) + + $(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile diff --git a/net/freeswitch-stable/patches/190-mod_pocketsphix-remove-alsa-dep.patch b/net/freeswitch-stable/patches/190-mod_pocketsphix-remove-alsa-dep.patch deleted file mode 100644 index d8e07b4..0000000 --- a/net/freeswitch-stable/patches/190-mod_pocketsphix-remove-alsa-dep.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/asr_tts/mod_pocketsphinx/Makefile.am -+++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile.am -@@ -27,7 +27,7 @@ $(SPHINXBASE_DIR): - - $(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR) - mkdir -p $(SPHINXBASE_BUILDDIR) -- (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=) -+ (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure ac_cv_header_alsa_asoundlib_h=no $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=) - $(TOUCH_TARGET) - - $(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile From fb6cc32a6aabc315edefb0473c162a60f4d08e42 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 27 Jun 2017 22:07:34 +0200 Subject: [PATCH 3/4] freeswitch-stable: Remove some needless variable escaping Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index c97fb2b..96485ad 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -366,19 +366,19 @@ Library (ESL). endef define Package/$(PKG_NAME)-misc-perl-esl/install - $(INSTALL_DIR) $(1)$$(PERL_SITELIB)/ESL + $(INSTALL_DIR) $(1)$(PERL_SITELIB)/ESL $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$$(PERL_SITELIB)/ESL.pm \ - $(1)$$(PERL_SITELIB) + $(PKG_INSTALL_DIR)$(PERL_SITELIB)/ESL.pm \ + $(1)$(PERL_SITELIB) $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)$$(PERL_SITELIB)/ESL.so \ - $(1)$$(PERL_SITELIB) + $(PKG_INSTALL_DIR)$(PERL_SITELIB)/ESL.so \ + $(1)$(PERL_SITELIB) $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$$(PERL_SITELIB)/ESL/Dispatch.pm \ - $(1)$$(PERL_SITELIB)/ESL + $(PKG_INSTALL_DIR)$(PERL_SITELIB)/ESL/Dispatch.pm \ + $(1)$(PERL_SITELIB)/ESL $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$$(PERL_SITELIB)/ESL/IVR.pm \ - $(1)$$(PERL_SITELIB)/ESL + $(PKG_INSTALL_DIR)$(PERL_SITELIB)/ESL/IVR.pm \ + $(1)$(PERL_SITELIB)/ESL endef define Package/$(PKG_NAME)-misc-python-esl @@ -497,13 +497,13 @@ ifeq ($(CONFIG_FS_STABLE_WITH_MODCONF),y) $(call Package/$(PKG_NAME)/install/dir,$$(1)$(FS_STABLE_EXAMPLES_DIR)/mod_$(1),$(PKG_BUILD_DIR)/src/mod/*/mod_$(1)/conf) endif ifeq ($(1),perl) - $(INSTALL_DIR) $$(1)$$(PERL_SITELIB)/auto + $(INSTALL_DIR) $$(1)$(PERL_SITELIB)/auto $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).pm \ - $$(1)$$(PERL_SITELIB) + $$(1)$(PERL_SITELIB) $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).so \ - $$(1)$$(PERL_SITELIB)/auto + $$(1)$(PERL_SITELIB)/auto endif ifeq ($(1),python) $(INSTALL_DIR) $$(1)$(PYTHON_PKG_DIR) From 639072e26e641bc2d316493262c483669d6644cf Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 27 Jun 2017 22:14:43 +0200 Subject: [PATCH 4/4] freeswitch-stable: cleanup Python setup - Rename PYTHON_PKG_DIR to PYTHON_SITE_DIR, otherwise it's confusing. - Remove the 'sed' hacks; handle the Python setup like the Perl setup is already done. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 47 +++++++------------ .../patches/030-fix-configure-ac.patch | 25 ++++++++++ .../patches/120-fix-copts.diff | 2 +- .../patches/220-esl-python.patch | 43 +++++++++++++++++ 4 files changed, 86 insertions(+), 31 deletions(-) create mode 100644 net/freeswitch-stable/patches/220-esl-python.patch diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 96485ad..3c9ad3a 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -393,13 +393,13 @@ Library (ESL). endef define Package/$(PKG_NAME)-misc-python-esl/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(INSTALL_DIR) $(1)$(PYTHON_SITE_DIR) $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/ESL.py \ - $(1)$(PYTHON_PKG_DIR) + $(PKG_INSTALL_DIR)$(PYTHON_SITE_DIR)/ESL.py \ + $(1)$(PYTHON_SITE_DIR) $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/_ESL.so \ - $(1)$(PYTHON_PKG_DIR) + $(PKG_INSTALL_DIR)$(PYTHON_SITE_DIR)/_ESL.so \ + $(1)$(PYTHON_SITE_DIR) endef define Package/$(PKG_NAME)-misc-timezones @@ -506,10 +506,10 @@ ifeq ($(1),perl) $$(1)$(PERL_SITELIB)/auto endif ifeq ($(1),python) - $(INSTALL_DIR) $$(1)$(PYTHON_PKG_DIR) + $(INSTALL_DIR) $$(1)$(PYTHON_SITE_DIR) $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/$(PRG_NAME).py \ - $$(1)$(PYTHON_PKG_DIR) + $(PKG_INSTALL_DIR)$(PYTHON_SITE_DIR)/$(PRG_NAME).py \ + $$(1)$(PYTHON_SITE_DIR) endif endef $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) @@ -635,15 +635,17 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl)$(CONFIG_PACKAGE_$(PKG_NAME) $(call include_mk, python-version.mk) -PYTHON_DIR:=$(STAGING_DIR)/usr -PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION) -PYTHON_LDFLAGS:=-lpython$(PYTHON_VERSION) -ldl -lpthread -lm -Xlinker -export-dynamic -PYTHON_PKG_DIR:=$(FS_STABLE_LIB_DIR)/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_DIR:=$(FS_STABLE_LIB_DIR)/python$(PYTHON_VERSION)/site-packages CONFIGURE_VARS+= \ - _python_sysroot="$(STAGING_DIR)" \ - _python_prefix="/usr" \ - _python_exec_prefix="/usr" + PYTHON_CFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)" \ + PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION) -ldl -lpthread -lm -Xlinker -export-dynamic" \ + PYTHON_LIB="python$(PYTHON_VERSION)" \ + PYTHON_LIBDIR="$(FS_STABLE_LIB_DIR)" \ + PYTHON_SITE_DIR="$(PYTHON_SITE_DIR)" + +CONFIGURE_ARGS+= \ + --with-python=$(STAGING_DIR_HOSTPKG)/bin/python$(PYTHON_VERSION) else @@ -754,21 +756,6 @@ define Build/Prepare $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), $(SED) '/mod_$(m)$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf)) -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl)$(CONFIG_PACKAGE_$(PKG_NAME)-mod-python),) - $(SED) 's|^LOCAL_CFLAGS=.*|LOCAL_CFLAGS=-I$(PYTHON_INC_DIR)|' \ - $(PKG_BUILD_DIR)/libs/esl/python/Makefile - $(SED) 's|^LOCAL_LDFLAGS=.*|LOCAL_LDFLAGS=$(PYTHON_LDFLAGS)|' \ - $(PKG_BUILD_DIR)/libs/esl/python/Makefile - $(SED) 's|^SITE_DIR=.*|SITE_DIR=$$$$(DESTDIR)$(PYTHON_PKG_DIR)|' \ - $(PKG_BUILD_DIR)/libs/esl/python/Makefile - $(SED) 's|^PYTHON_SITE_DIR=.*|PYTHON_SITE_DIR=$(PYTHON_PKG_DIR)|' \ - $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am - $(SED) 's|@PYTHON_CFLAGS@|-I$(PYTHON_INC_DIR)|' \ - $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am - $(SED) 's|@PYTHON_LDFLAGS@|$(PYTHON_LDFLAGS)|' \ - $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am -endif - $(SED) 's|$(FS_STABLE_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_STABLE_APR_LIBS) $(TARGET_LDFLAGS))|' \ $(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4 diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch index ce9aaa0..0839360 100644 --- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch +++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch @@ -55,3 +55,28 @@ save_CFLAGS="$CFLAGS" CFLAGS="$PERL_CFLAGS" +@@ -1656,24 +1626,12 @@ then + if test "$python_has_distutils" != "no" ; then + AC_MSG_CHECKING([location of site-packages]) + +- PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" +- + if test -z "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Unable to detect python site-packages path]) +- elif test ! -d "$PYTHON_SITE_DIR" ; then +- AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) + fi + AC_MSG_RESULT([$PYTHON_SITE_DIR]) + AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) + +- # +- # python distutils found, get settings from python directly +- # +- PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`" +- PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`" +- PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`" +- PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`" +- + # handle python being installed into /usr/local + AC_MSG_CHECKING([python libdir]) + if test -z "`echo $PYTHON_LIBDIR | grep "/usr/lib"`" ; then diff --git a/net/freeswitch-stable/patches/120-fix-copts.diff b/net/freeswitch-stable/patches/120-fix-copts.diff index 2959db4..4940acf 100644 --- a/net/freeswitch-stable/patches/120-fix-copts.diff +++ b/net/freeswitch-stable/patches/120-fix-copts.diff @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1953,7 +1953,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) +@@ -1941,7 +1941,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) diff --git a/net/freeswitch-stable/patches/220-esl-python.patch b/net/freeswitch-stable/patches/220-esl-python.patch new file mode 100644 index 0000000..11b39ef --- /dev/null +++ b/net/freeswitch-stable/patches/220-esl-python.patch @@ -0,0 +1,43 @@ +--- a/libs/esl/python/Makefile ++++ b/libs/esl/python/Makefile +@@ -1,6 +1,4 @@ +-LOCAL_CFLAGS=`python ./python-config --includes` +-LOCAL_LDFLAGS=`python ./python-config --ldflags` +-SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"` ++SITE_DIR=$(DESTDIR)/$(PYTHON_SITE_DIR) + + all: _ESL.so + +@@ -8,10 +6,10 @@ esl_wrap.cpp: + swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i + + esl_wrap.o: esl_wrap.cpp +- $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o ++ $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(PYTHON_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o + + _ESL.so: esl_wrap.o +- $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o _ESL.so -L. $(LIBS) ++ $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(PYTHON_LDFLAGS) -o _ESL.so -L. $(LIBS) + + install: _ESL.so + mkdir -p $(SITE_DIR) +--- a/libs/esl/Makefile.am ++++ b/libs/esl/Makefile.am +@@ -77,7 +77,7 @@ luamod: $(MYLIB) + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" LUA_CFLAGS="$(LUA_CFLAGS)" LUA_LIBS="$(LUA_LIBS)" -C lua + + pymod: $(MYLIB) +- $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python ++ $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" PYTHON_CFLAGS="$(PYTHON_CFLAGS)" PYTHON_LDFLAGS="$(PYTHON_LDFLAGS)" -C python + + tclmod: $(MYLIB) + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C tcl +@@ -98,7 +98,7 @@ phpmod-install: phpmod + $(MAKE) -C php install + + pymod-install: pymod +- $(MAKE) -C python install ++ $(MAKE) PYTHON_SITE_DIR="$(PYTHON_SITE_DIR)" -C python install + + rubymod-install: rubymod + $(MAKE) -C ruby install