From 6369299d9b085d24397f3c0b91cc62ab729fd528 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 19 Aug 2017 16:27:01 +0200 Subject: [PATCH] asterisk13: clean up configure stage - Remove some unneeded parentheses. - Remove $(SITE_VARS) as it is not used. - Remove --without-curl and --with-uuid=... from configure arguments as they've been removed from configure. Signed-off-by: Sebastian Kemper --- net/asterisk-13.x/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index fbd8eb8..8b7cf3d 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -190,7 +190,7 @@ CONFIGURE_ARGS+= \ --without-execinfo \ --without-bluetooth \ --without-cap \ - $(if $(CONFIG_PACKAGE_$(PKG_NAME)-curl),--with-libcurl="$(STAGING_DIR)/usr",--without-curl) \ + $(if $(CONFIG_PACKAGE_$(PKG_NAME)-curl),--with-libcurl="$(STAGING_DIR)/usr") \ --without-curses \ --with-gsm=internal \ --without-gtk2 \ @@ -222,7 +222,6 @@ CONFIGURE_ARGS+= \ --without-tds \ --without-termcap \ --without-tinfo \ - --with-uuid="$(STAGING_DIR)/usr" \ --without-vorbis \ --without-vpb \ --with-z="$(STAGING_DIR)/usr" \ @@ -246,11 +245,10 @@ endif endef define Build/Configure - (cd $(PKG_BUILD_DIR); \ - ./bootstrap.sh; \ - ); - $(call Build/Configure/Default,,$(SITE_VARS)) - (cd $(PKG_BUILD_DIR)/menuselect; \ + cd $(PKG_BUILD_DIR); \ + ./bootstrap.sh + $(call Build/Configure/Default) + cd $(PKG_BUILD_DIR)/menuselect; \ ./bootstrap.sh; \ CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ @@ -259,8 +257,7 @@ define Build/Configure ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \ ./configure \ $(HOST_CONFIGURE_ARGS) \ - $(AST_MENUSELECT_OPTS) \ - ); + $(AST_MENUSELECT_OPTS) endef define Build/Compile -- 2.30.2