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/defs.mk
View file

@ -13,7 +13,7 @@ comma := ,
# ----- executables
include $(MODDIR)/make/projects.mk
include $(JWBDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
@ -252,7 +252,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
JW_BUILD_DIR = $(MODDIR)
JW_BUILD_DIR = $(JWBDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
# only works if checked out true to CVS, i.e. below proj
@ -263,19 +263,19 @@ endif
REV_SUBDIRS = $(call reverse $(SUBDIRS))
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS))
REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
ifeq ($(DEVELOPMENT),true)
-include $(MODDIR)/make/defs-dev.mk
-include $(JWBDIR)/make/defs-dev.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)
include $(TOPDIR)/make/cfg_dev.mk
endif
else
-include $(MODDIR)/make/defs-dist.mk
-include $(JWBDIR)/make/defs-dist.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),)
include $(TOPDIR)/make/cfg_dist.mk
endif
@ -482,7 +482,7 @@ ifeq ($(CREATE_PKG_CONFIG),true)
INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
BUILD_PKG_CONFIGDIR = $(JWBDIR)/pkgconfig
else
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make
endif
@ -496,9 +496,9 @@ INSTALL_DIR ?= $(INSTALL)
# ----- local.mk
$(eval $(call try_include,$(MODDIR)/make/local.mk))
$(eval $(call try_include,$(JWBDIR)/make/local.mk))
#-include $(MODDIR)/make/local.mk
#-include $(JWBDIR)/make/local.mk
$(eval $(call try_include,$(TOPDIR)/make/local.mk))
$(eval $(call try_include,local.mk))