From 908f4d7eb10cf7d86c1d5295ce663a67a16e84a7 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 23 Dec 2015 13:57:10 -0400 Subject: [PATCH] [core] Fix build script paths --- scripts/main.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/main.mk b/scripts/main.mk index 4d30d811b..7caa4ae60 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -12,16 +12,16 @@ export HOST_VERSION ?= $(BUILD_VERSION) # Optionally include version-specific host defaults -include scripts/$(HOST)/$(HOST_VERSION)/defaults.mk +-include platform/$(HOST)/scripts/$(HOST)/defaults.mk export MASON_PLATFORM=$(HOST) export MASON_PLATFORM_VERSION=$(HOST_VERSION) -ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh)) - CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh -endif - export HOST_SLUG = $(HOST)-$(HOST_VERSION) CONFIGURE_FILES = platform/$(HOST)/scripts/configure.sh +ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh)) + CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh +endif ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh)) CONFIGURE_FILES += platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh endif