diff --git a/make/proj.mk b/make/proj.mk index 229f670..f9f0324 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -5,7 +5,7 @@ ifeq ($(TARGET),mingw) FLAVOUR_PATH_PREFIX = win32/ endif DEV_PROJECTS_DIR ?= $(TOPDIR)/.. -JWBDIR_NAME ?= jw-build +JWBDIR_NAME ?= jw-pkg JWBDIR_SEARCH_PATH ?= $(DEV_PROJECTS_DIR) $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX) JWBDIR ?= $(firstword $(wildcard $(addsuffix /$(JWBDIR_NAME),$(JWBDIR_SEARCH_PATH)))) diff --git a/make/project.conf b/make/project.conf index ef6171a..dc03e8a 100644 --- a/make/project.conf +++ b/make/project.conf @@ -17,5 +17,5 @@ libname = none run = mypy, python3-magic, python3-termcolor, python3-pytimeparse, python3-argcomplete, python3-ldap [pkg.requires.jw] -devel = jw-python-run = VERSION-REVISION, jw-build-devel = VERSION -build = jw-build-devel +devel = jw-python-run = VERSION-REVISION, jw-pkg-devel = VERSION +build = jw-pkg-devel