janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

Everywhere: Rename MODDIR -> JWBDIR

Browse source 
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:34:18 +00:00
commit b2d6e6f554
109 changed files with 279 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/make.mk
View file

@ -3,14 +3,14 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-dirs.mk
include $(MODDIR)/make/dev-utils.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/defs-dirs.mk
include $(JWBDIR)/make/dev-utils.mk
CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME
include $(MODDIR)/make/cache.mk
include $(JWBDIR)/make/cache.mk
ifneq ($(CREATE_DEVEL),false)
MKFILES += $(wildcard project.conf)
@ -20,14 +20,14 @@ ifneq ($(CREATE_DEVEL),false)
endif
endif
include $(MODDIR)/make/rules.mk
include $(JWBDIR)/make/rules.mk
INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d
INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(JWBDIR)/make/deps.d
ifneq ($(wildcard pckg-deps.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk
endif
INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
INSTALL_PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d
ifneq ($(wildcard pckg-defs.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
endif
@ -60,7 +60,7 @@ ifeq ($(CREATE_PKG_CONFIG),true)
CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
endif
$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(JWBDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \
-F $< \
-n $(PROJECT) \