Fixed config importation in Makefile.
This commit is contained in:
parent
4a00e9f6d4
commit
c8c6620ba7
18
Makefile
18
Makefile
|
|
@ -4,6 +4,15 @@ SHELL = /usr/bin/env bash
|
||||||
|
|
||||||
ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
|
ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
|
||||||
|
|
||||||
|
# Import config
|
||||||
|
ifeq ($(filter clean-all,$(MAKECMDGOALS)),)
|
||||||
|
ifneq ($(realpath $(ROOT)/config.mk), $(ROOT)/config.mk)
|
||||||
|
$(error ERROR: Please run the configure script before building)
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(ROOT)/config.mk
|
||||||
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# User settings
|
# User settings
|
||||||
#
|
#
|
||||||
|
|
@ -39,15 +48,6 @@ endif
|
||||||
# End
|
# End
|
||||||
#
|
#
|
||||||
|
|
||||||
# Import config
|
|
||||||
ifeq ($(filter clean-all,$(MAKECMDGOALS)),)
|
|
||||||
ifneq ($(realpath $(ROOT)/config.mk), $(ROOT)/config.mk)
|
|
||||||
$(error ERROR: Please run the configure script before building)
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(ROOT)/config.mk
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Relocate vars
|
# Relocate vars
|
||||||
BUILD_DIR := $(ROOT)/$(BUILD_DIR)/$(TARGET_HOST)
|
BUILD_DIR := $(ROOT)/$(BUILD_DIR)/$(TARGET_HOST)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue