freeswitch-stable: cleanup Python setup

[feed/telephony.git] / net / freeswitch-stable / Makefile

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 96485ad17bbf9036e00513952f1e0dde5f1acb5d..3c9ad3a6dcd2cbebd927ac3aa20a454785f20d73 100644 (file)
--- 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