Skip to content

Commit

Permalink
Update makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
rnixx committed Feb 26, 2024
1 parent f82e495 commit 8babb9f
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ CLEAN_FS?=build \
# Default: include.mk
INCLUDE_MAKEFILE?=include.mk

# Optional additional directories to be added to PATH in format
# `/path/to/dir/:/path/to/other/dir`. Gets inserted first, thus gets searched
# first.
# No default value.
EXTRA_PATH?=

## js.npm

# Value for `--prefix` option.
Expand Down Expand Up @@ -159,6 +165,8 @@ DIRTY_TARGETS?=
CLEAN_TARGETS?=
PURGE_TARGETS?=

export PATH:=$(if $(EXTRA_PATH),"$(EXTRA_PATH):","")$(PATH)

# Defensive settings for make: https://tech.davis-hansson.com/p/make/
SHELL:=bash
.ONESHELL:
Expand All @@ -183,7 +191,7 @@ $(SENTINEL):
# npm
##############################################################################

export PATH:=$(shell pwd)/$(NPM_PREFIX)/node_modules/.bin/:$(PATH)
export PATH:=$(shell pwd)/$(NPM_PREFIX)/node_modules/.bin:$(PATH)

# case `system.dependencies` domain is included
SYSTEM_DEPENDENCIES+=npm
Expand Down Expand Up @@ -301,7 +309,7 @@ endif

# determine the executable path
ifeq ("$(VENV_ENABLED)", "true")
export PATH:=$(shell pwd)/$(VENV_FOLDER)/bin/:$(PATH)
export PATH:=$(shell pwd)/$(VENV_FOLDER)/bin:$(PATH)
export VIRTUAL_ENV=$(VENV_FOLDER)
MXENV_PYTHON=python
else
Expand Down

0 comments on commit 8babb9f

Please sign in to comment.