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 MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR

Browse source 
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:45:24 +00:00
commit bdd66dbc26
25 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/defs.mk
View file

@ -16,7 +16,7 @@ comma := ,
include $(JWBDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
export SHELL := /bin/bash $(JWB_SCRIPT_DIR)/timed-make-shell.sh
else
export SHELL := /bin/bash
endif
@ -85,7 +85,7 @@ ifndef PRINTF
PRINTF := $(shell $(WHICH) printf)
endif
PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
@ -115,7 +115,7 @@ reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordli
make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
make_subdirs_target = set -e; for D in $(SUBDIRS) ; do make -C $$D $@; done
install_local_cfg = $(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@
cvs_files = sh $(MOD_SCRIPT_DIR)/scm.sh ls-files -f
cvs_files = sh $(JWB_SCRIPT_DIR)/scm.sh ls-files -f
add_flavour_prefix = $(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
beautify_lib_path = $(SED) 's/:/\n + /g'
find_files = $(wildcard $(addsuffix /$(1),$(patsubst :, ,$(2))))
@ -196,7 +196,7 @@ else
endif
ifeq ($(PKG_FORMAT),debian)
RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh
RPM ?= /bin/bash $(JWB_SCRIPT_DIR)/dpm.sh
RPM_ARCH := $(shell dpkg --print-architecture)
RPM_SUFFIX ?= deb
else