mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 05:36:32 +00:00
Ensure shell environment is handled correctly
This commit is contained in:
parent
82c92e1e1a
commit
efd8576c2e
16
Makefile
16
Makefile
@ -33,14 +33,10 @@ noconfig_targets:=menuconfig config oldconfig randconfig \
|
|||||||
|
|
||||||
|
|
||||||
# Use shell variables, if defined
|
# Use shell variables, if defined
|
||||||
ifneq ($(BUILDROOT_DL_DIR),)
|
|
||||||
BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(BUILDROOT_LOCAL),)
|
ifneq ($(BUILDROOT_LOCAL),)
|
||||||
LOCAL:=$(BUILDROOT_LOCAL)
|
BR2_LOCAL:=$(BUILDROOT_LOCAL)
|
||||||
else
|
else
|
||||||
LOCAL:=$(TOPDIR)/local
|
BR2_LOCAL:=$(TOPDIR)/local
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# $(shell find . -name *_defconfig |sed 's/.*\///')
|
# $(shell find . -name *_defconfig |sed 's/.*\///')
|
||||||
@ -51,10 +47,16 @@ ifeq ($(BOARD),)
|
|||||||
-include $(TOPDIR).config
|
-include $(TOPDIR).config
|
||||||
else
|
else
|
||||||
# if "make" command
|
# if "make" command
|
||||||
-include $(LOCAL)/$(BOARD)/$(BOARD).config
|
-include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Override BR2_DL_DIR if shell variable defined
|
||||||
|
ifneq ($(BUILDROOT_DL_DIR),)
|
||||||
|
BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
|
||||||
|
endif
|
||||||
|
LOCAL:=$(BR2_LOCAL)
|
||||||
|
|
||||||
# To put more focus on warnings, be less verbose as default
|
# To put more focus on warnings, be less verbose as default
|
||||||
# Use 'make V=1' to see the full commands
|
# Use 'make V=1' to see the full commands
|
||||||
ifdef V
|
ifdef V
|
||||||
|
Loading…
x
Reference in New Issue
Block a user