From bdd66dbc267e1a72d566b4ff51be5137e80f9ee2 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 29 Jun 2019 21:45:24 +0000
Subject: [PATCH] Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR

Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 doc/packaging/add-pkg-conflicts-support.patch |  2 +-
 make/dav.mk                                   |  2 +-
 make/defs.mk                                  |  8 +++----
 make/isolinux.mk                              |  2 +-
 make/list-files.mk                            |  2 +-
 make/make.mk                                  |  4 ++--
 make/platform.mk                              |  4 ++--
 make/profile.mk                               |  2 +-
 make/projects-dir.mk                          | 18 +++++++-------
 make/projects.mk                              |  2 +-
 make/py-mod.mk                                |  2 +-
 make/py-rules.mk                              |  2 +-
 make/rpmdist.mk                               | 12 +++++-----
 make/rules.mk                                 |  8 +++----
 make/run.mk                                   |  4 ++--
 make/smart-selection.mk                       |  6 ++---
 make/suse-selection.mk                        |  4 ++--
 make/tagged-tmpl.mk                           |  2 +-
 make/theme-images.mk                          |  2 +-
 make/topdir.mk                                |  6 ++---
 make/upload-defs-rpm.mk                       |  6 ++---
 make/upload-defs.mk                           |  2 +-
 scripts/create-mkdebian.sh                    |  2 +-
 scripts/create-mkspec.sh                      |  2 +-
 scripts/pkg.sh                                | 24 +++++++++----------
 25 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/doc/packaging/add-pkg-conflicts-support.patch b/doc/packaging/add-pkg-conflicts-support.patch
index 753b5fd2..61b0bf3f 100644
--- a/doc/packaging/add-pkg-conflicts-support.patch
+++ b/doc/packaging/add-pkg-conflicts-support.patch
@@ -24,7 +24,7 @@ diff -u -r1.137 rpmdist.mk
 +	-N $(RPM_PROJECT) -P $(PROJECT) \
 +	-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
 +	-X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
- 	-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
+ 	-m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
  	-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
  
 Index: scripts/create-mkdebian.sh
diff --git a/make/dav.mk b/make/dav.mk
index 5ab9e490..834ae3bb 100644
--- a/make/dav.mk
+++ b/make/dav.mk
@@ -6,7 +6,7 @@ DAV_SERVER                  ?= cvs.janware.com
 DAV_RSYNC_SERVER            ?= $(DAV_SERVER)
 DAV_RSYNC_DIR               ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT)
 DAV_RSYNC_URL                = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
-DAV_RSYNC_EXCLUDE           ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files)
+DAV_RSYNC_EXCLUDE           ?= $(shell bash $(JWB_SCRIPT_DIR)/scm.sh ls-files)
 DAV_RSYNC_EXCLUDE_OPTS       = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
 DAV_RSYNC_EXTRA_OPTS        ?=
 DAV_RSYNC                   ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)
diff --git a/make/defs.mk b/make/defs.mk
index 441f689b..9962c5cf 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -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
diff --git a/make/isolinux.mk b/make/isolinux.mk
index 4014418e..5fd832c4 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -55,7 +55,7 @@ unpack.done: $(URL_FILE) dload.done
 	mv $(SYSLINUX_BASE) $(UNPACK_DIR)
 	touch $@
 
-GENERATE                     = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh
+GENERATE                     = /bin/bash $(JWB_SCRIPT_DIR)/generate-boot-medium.sh
 BOOT_CONF                    = boot.conf
 
 $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
diff --git a/make/list-files.mk b/make/list-files.mk
index 7e28b062..2c577b03 100644
--- a/make/list-files.mk
+++ b/make/list-files.mk
@@ -1,4 +1,4 @@
-LIST_VCS_FILES              := /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files
+LIST_VCS_FILES              := /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files
 
 ifndef LIST_FILES_MK_INCLUDED
 LIST_FILES_MK_INCLUDED := true
diff --git a/make/make.mk b/make/make.mk
index 54df1877..d7585c9d 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -60,8 +60,8 @@ ifeq ($(CREATE_PKG_CONFIG),true)
     CREATE_PKG_CONFIG_OPTS  += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
   endif
 
-$(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 \
+$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(JWBDIR)/make/make.mk $(JWB_SCRIPT_DIR)/create-pkg-config.sh
+	/bin/bash $(JWB_SCRIPT_DIR)/create-pkg-config.sh \
 		-F $< \
 		-n $(PROJECT) \
 		-v $(DIST_VERSION) \
diff --git a/make/platform.mk b/make/platform.mk
index 72438a09..dc7a3b52 100644
--- a/make/platform.mk
+++ b/make/platform.mk
@@ -16,9 +16,9 @@ $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk))
 $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
 $(eval $(call try_include,pre-local.mk))
 
-MOD_SCRIPT_DIR              := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin))
+JWB_SCRIPT_DIR              := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin))
 ifndef GET_OS_SH
-  GET_OS_SH                 := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh
+  GET_OS_SH                 := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh
 endif
 
 # -- product
diff --git a/make/profile.mk b/make/profile.mk
index d0b9cc85..1ac3c0d7 100644
--- a/make/profile.mk
+++ b/make/profile.mk
@@ -23,4 +23,4 @@ path-%.sh:
 	@echo "export PATH=\$$PATH:$(INSTALL_EXEDIR)" > $@.tmp
 	mv $@.tmp $@
 clean.profile:
-	/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f $(PROFILE)
+	/bin/bash $(JWB_SCRIPT_DIR)/scm.sh clean -f $(PROFILE)
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index f2c45f49..f9b41f50 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -46,8 +46,8 @@ export JW_BUILD_VERBOSE
 # ------------ external programs I
 
 CWD                         := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-MOD_SCRIPT_DIR               = ./jw-build/scripts
-GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found)
+JWB_SCRIPT_DIR               = ./jw-build/scripts
+GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found)
 SSH_WRAPPER_SH              := $(CWD)/ssh-wrapper.sh
 
 EXCLUDES_FILE               ?= exclude.txt
@@ -116,14 +116,14 @@ EDITOR                      ?= xdg-open
 ifeq ($(TIME),)
   TIME                       = $(shell which time) -p
 endif
-PROJECTS_PY                  = python3 $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS)
+PROJECTS_PY                  = python3 $(JWB_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS)
 PROJECTS_PY_BUILD            = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS)
-PGIT_SH                      = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh
-PURGE_SH                     = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
-PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
-CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
-LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
-JW_PKG                       = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
+PGIT_SH                      = /bin/bash $(JWB_SCRIPT_DIR)/pgit.sh
+PURGE_SH                     = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
+PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
+CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
+LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
+JW_PKG                       = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
 GIT_SRV_ADMIN_SH             = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
 CVS_ADMIN_SH                 = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh
 
diff --git a/make/projects.mk b/make/projects.mk
index 058c5021..d6717b81 100644
--- a/make/projects.mk
+++ b/make/projects.mk
@@ -35,7 +35,7 @@ else
 endif
 
 ifneq ($(TOPDIR),)
-  proj_query_cmd             = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS)
+  proj_query_cmd             = $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS)
   proj_query                 = $(shell $(proj_query_cmd) $(1))
   proj_dir                   = $(call proj_query,proj-dir $(1))
   htdocs_dir                 = $(call proj_query,htdocs-dir $(1))
diff --git a/make/py-mod.mk b/make/py-mod.mk
index d01c07e8..d3cd9efb 100644
--- a/make/py-mod.mk
+++ b/make/py-mod.mk
@@ -18,5 +18,5 @@ include $(JWBDIR)/make/py-rules.mk
 
 __init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY))
 	if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi
-	/bin/bash +H $(MOD_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee -a $@.tmp
+	/bin/bash +H $(JWB_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee -a $@.tmp
 	mv $@.tmp $@
diff --git a/make/py-rules.mk b/make/py-rules.mk
index 8d49c5ae..aa463a8b 100644
--- a/make/py-rules.mk
+++ b/make/py-rules.mk
@@ -2,7 +2,7 @@ all:
 
 py.clean:
 	$(RM) -f *.done *.pyc
-	/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
+	/bin/bash $(JWB_SCRIPT_DIR)/scm.sh clean -f __init__.py
 	$(RM) -rf __pycache__
 
 install-dirs.done:
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index f2011b27..159cb8de 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -8,9 +8,9 @@ endif
 RPM_VERSION                 ?= $(DIST_VERSION)
 
 ifneq ($(BUILD_PROJECT_PACKAGE),false)
-UPLOAD_SH                    = $(MOD_SCRIPT_DIR)/upload.sh
+UPLOAD_SH                    = $(JWB_SCRIPT_DIR)/upload.sh
 LOCAL_MKSPEC_SH             ?= $(TOPDIR)/make/mkspec.sh
-MKSPEC_SH                   ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
+MKSPEC_SH                   ?= $(JWB_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
 FTP_SRC_GROUP               ?= $(shell id -g)
 FTP_SRC_USER                ?= $(shell whoami)
 FTP_RUN_GROUP               ?= $(shell id -g)
@@ -106,7 +106,7 @@ PKG_SH                       = $(PKG_SH_EXE) \
 	-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
 	-X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
 	--provides-run "$(RPM_PROVIDES_RUN)" --provides-devel "$(RPM_PROVIDES_DEVEL)" \
-	-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
+	-m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
 	-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
 
 # -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently
@@ -143,7 +143,7 @@ clean.rpm:
 #else
 #
 #$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
-#	sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
+#	sh $(JWB_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
 #	mv $@.tmp $@
 #
 #clean.mkspec:
@@ -188,7 +188,7 @@ pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
 	touch $@
 
 pkg-upload-local.dist: pkgbuild.dist
-	$(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
+	$(JWB_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
 	touch $@
 
 pkginstall.dist: pkg-build.dist
@@ -291,7 +291,7 @@ define increase_build_number
 	echo -n "+ increasing build number to " ;\
 	echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\
 	echo $(HASH) > HASH ;\
-	if ! /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files | grep -q '^HASH$$'; then \
+	if ! /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files | grep -q '^HASH$$'; then \
 		$(SCM_ADD) HASH ;\
 	fi ;\
 	$(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION
diff --git a/make/rules.mk b/make/rules.mk
index 8cfd0be7..8f82c659 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -192,7 +192,7 @@ echo-libpath:
 	@echo LD_LIBRARY_PATH = :$(LD_LIBRARY_PATH) | $(beautify_lib_path)
 
 echo-lddtree:
-	bash $(MOD_SCRIPT_DIR)/linktree.sh $(REAL_LDFLAGS)
+	bash $(JWB_SCRIPT_DIR)/linktree.sh $(REAL_LDFLAGS)
 
 echo-path:
 	@echo PATH = :$(PATH) | $(beautify_lib_path)
@@ -282,7 +282,7 @@ $(SO_PREFIX)%.so: %.o
 endif
 
 $(VERSION_SCRIPT):
-	sh $(MOD_SCRIPT_DIR)/make-version-script.sh $(BINARY_VERSION) > $@.tmp
+	sh $(JWB_SCRIPT_DIR)/make-version-script.sh $(BINARY_VERSION) > $@.tmp
 	mv $@.tmp $@
 
 ifneq ($(TARGET),mingw)
@@ -437,9 +437,9 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
 	$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
 
 find:
-	@bash $(MOD_SCRIPT_DIR)/scm.sh ls-files
+	@bash $(JWB_SCRIPT_DIR)/scm.sh ls-files
 
 collect:
-	bash $(MOD_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR)
+	bash $(JWB_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR)
 
 endif # ifndef JW_BUILD_RULES_MK_INCLUDED
diff --git a/make/run.mk b/make/run.mk
index 47049caa..bff65d66 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -134,11 +134,11 @@ supp.tmp:
 	valgrind  --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0
 
 vg-create-supp: supp.tmp
-	$(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
+	$(CAT) $< | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
 	$(RM) -f supp.tmp
 
 vg-add-supp:
-	$(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp
+	$(CAT) | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp
 
 vg-clean-supp:
 	$(RM) -f local.supp
diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index a9aa507f..0d5db757 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -1,7 +1,7 @@
 # === variable definitions
-GET_OS_SH                    = sh $(MOD_SCRIPT_DIR)/get-os.sh
-GENERATE_SELECTION           = sh $(MOD_SCRIPT_DIR)/generate_selection.sh
-UPLOAD_SH                    = sh $(MOD_SCRIPT_DIR)/upload.sh
+GET_OS_SH                    = sh $(JWB_SCRIPT_DIR)/get-os.sh
+GENERATE_SELECTION           = sh $(JWB_SCRIPT_DIR)/generate_selection.sh
+UPLOAD_SH                    = sh $(JWB_SCRIPT_DIR)/upload.sh
 
 DISTRIBUTOR                  = $(shell $(GET_OS_SH) | cut -d- -f1)
 DISTRO_RELEASE               = $(shell $(GET_OS_SH) | cut -d- -f2-)
diff --git a/make/suse-selection.mk b/make/suse-selection.mk
index 92aee0f7..d17aa0fb 100644
--- a/make/suse-selection.mk
+++ b/make/suse-selection.mk
@@ -1,10 +1,10 @@
 JWBDIR                       = $(HOME)/local/src/cvs.main/proj/jw-build
 include $(JWBDIR)/make/defs.mk
 
-GENERATE_SELECTION           = $(MOD_SCRIPT_DIR)/generate_selection.sh
+GENERATE_SELECTION           = $(JWB_SCRIPT_DIR)/generate_selection.sh
 SUSE_RELEASE                 = 10.1
 UPLOAD_URL                   = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
-UPLOAD_SH                    = $(MOD_SCRIPT_DIR)/upload.sh
+UPLOAD_SH                    = $(JWB_SCRIPT_DIR)/upload.sh
 
 SELECTION                    = $(shell sh $(GENERATE_SELECTION) -s).sel
 
diff --git a/make/tagged-tmpl.mk b/make/tagged-tmpl.mk
index 43b5f178..69b1fd9a 100644
--- a/make/tagged-tmpl.mk
+++ b/make/tagged-tmpl.mk
@@ -17,7 +17,7 @@ include $(JWBDIR)/make/defs.mk
 #clean: tmpl.clean
 #
 #tmpl.clean:
-#	/bin/bash $(MOD_SCRIPT_DIR)/scm.sh -f $(TAGGED_TMPL_GENERATED)
+#	/bin/bash $(JWB_SCRIPT_DIR)/scm.sh -f $(TAGGED_TMPL_GENERATED)
 #
 #%: %.tmpl
 #	cat %< | $(TAGGED_TMPL_UNTEMPLATE) > $@.tmp
diff --git a/make/theme-images.mk b/make/theme-images.mk
index 8332683f..13f3899e 100644
--- a/make/theme-images.mk
+++ b/make/theme-images.mk
@@ -12,7 +12,7 @@ clean: doneclean
 distclean:
 
 %-greyed-out.png: %.png
-	/bin/bash $(MOD_SCRIPT_DIR)/convert-to-greyed-out-image.sh $< $@.tmp
+	/bin/bash $(JWB_SCRIPT_DIR)/convert-to-greyed-out-image.sh $< $@.tmp
 	mv $@.tmp $@
 
 basedir.done:
diff --git a/make/topdir.mk b/make/topdir.mk
index 0d7791c6..707e3146 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -64,7 +64,7 @@ include $(JWBDIR)/make/rules.mk
 include $(JWBDIR)/make/doc-rules.mk
 include $(JWBDIR)/make/list-files.mk
 
-STREAMLINE_PROJECT          ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh
+STREAMLINE_PROJECT          ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh
 
 INSTALLED_TOPDIR_FILES       = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
 
@@ -162,7 +162,7 @@ git-update-project-description:
 	ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)"
 
 projects-%:
-	python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(PROJECT)
+	python2 $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
 
 install-deps-devel:
 	sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
@@ -171,7 +171,7 @@ streamline:
 	$(STREAMLINE_PROJECT)
 
 $(GIT_DESCR): $(PROJECT_DESCR_FILE)
-	/bin/bash $(MOD_SCRIPT_DIR)/ini-section.sh summary $< | tee $@.tmp
+	/bin/bash $(JWB_SCRIPT_DIR)/ini-section.sh summary $< | tee $@.tmp
 	mv $@.tmp $@
 
 git-init.done:
diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk
index 336e4a18..ccbb2596 100644
--- a/make/upload-defs-rpm.mk
+++ b/make/upload-defs-rpm.mk
@@ -1,10 +1,10 @@
 # this makefile needs
 # PCKG_ROOT
 # VERSION
-# MOD_SCRIPT_DIR
+# JWB_SCRIPT_DIR
 
-#UPLOAD_SH                   = $(MOD_SCRIPT_DIR)/upload.sh
-#MKSPEC_SH                   = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh
+#UPLOAD_SH                   = $(JWB_SCRIPT_DIR)/upload.sh
+#MKSPEC_SH                   = $(JWB_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh
 
 #FTP_FILE_MODE              ?= 640
 #FTP_DIR_MODE               ?= 750
diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index 32c5a121..9de30feb 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -1,4 +1,4 @@
-UPLOAD_SH                   ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh
+UPLOAD_SH                   ?= /bin/bash $(JWB_SCRIPT_DIR)/upload.sh
 UPLOAD_PROJECT              ?= $(PROJECT)
 UPLOAD_MODULE               ?= $(UPLOAD_PROJECT)
 UPLOAD_FILE_MODE            ?= 640
diff --git a/scripts/create-mkdebian.sh b/scripts/create-mkdebian.sh
index 2c2f9175..9aa1fe1f 100644
--- a/scripts/create-mkdebian.sh
+++ b/scripts/create-mkdebian.sh
@@ -123,7 +123,7 @@ override_dh_auto_install:
 	mkdir -p \`dirname \$INSTALL_LOG\`
 	> \$INSTALL_LOG
 	\\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install
-	PATH=$MOD_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
+	PATH=$JWB_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
 	dh_installdirs
 
 override_dh_shlibdeps:
diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh
index 7f080400..e79db151 100644
--- a/scripts/create-mkspec.sh
+++ b/scripts/create-mkspec.sh
@@ -102,7 +102,7 @@ _cat <<- EOT
 	|echo "mkdir -p \`dirname \$INSTALL_LOG\`"
 	|echo "> \$INSTALL_LOG"
 	|echo "make install"
-	|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
+	|echo "export PATH=$JWB_SCRIPT_DIR:\\\$PATH"
 	|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
 	|echo "exit 0" # <- Cut short CentOS magic appended to install scriptlet, which would generate .pyo files and other cruft.
 EOT
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index aa87db05..283c56cf 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -36,7 +36,7 @@ fatal()
 
 os()
 {
-	/bin/bash $MOD_SCRIPT_DIR/get-os.sh
+	/bin/bash $JWB_SCRIPT_DIR/get-os.sh
 }
 
 scm_commit()
@@ -90,7 +90,7 @@ scm_files()
 {
 	(
 		cd $TOPDIR
-		/bin/bash $MOD_SCRIPT_DIR/scm.sh ls-files -f $@
+		/bin/bash $JWB_SCRIPT_DIR/scm.sh ls-files -f $@
 	)
 }
 
@@ -448,18 +448,18 @@ build_pkg()
 
 		# --- generate spec file
 		local mkdef_sh=$TOPDIR/make/mk$deffmt.sh
-		local mkdef_wrapper_sh=$MOD_SCRIPT_DIR/mkspec-wrapper.sh
+		local mkdef_wrapper_sh=$JWB_SCRIPT_DIR/mkspec-wrapper.sh
 
 		[ ! -r $mkdef_wrapper_sh ] && \
 			fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"."
 
 		scm_files | grep -q make/mk$deffmt.sh || {
-			local create_mkdef_sh=$MOD_SCRIPT_DIR/create-mk$deffmt.sh
+			local create_mkdef_sh=$JWB_SCRIPT_DIR/create-mk$deffmt.sh
 			[ ! -r "$PROJECT_DESCR_FILE" ] && \
 				fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"."
 			[ ! -r "$create_mkdef_sh" ] && \
 				fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"."
-			PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
+			PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
 			mv $mkdef_sh.tmp $mkdef_sh
 			tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh"
 		}
@@ -469,7 +469,7 @@ build_pkg()
 
 		(
 			cd $src_tree
-			PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
+			PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
 				-V $version \
 				-S $tar_archive \
 				-N $RPM_PROJECT \
@@ -503,7 +503,7 @@ build_pkg()
 		#exit
 		#cp $DIST_PCKG_DIR/$tar_archive $src_tree/../$tar_archive_orig
 		(
-			local mod_script_dir=`readlink -f $MOD_SCRIPT_DIR`
+			local mod_script_dir=`readlink -f $JWB_SCRIPT_DIR`
 			cd $src_tree
 			#export ENV_PREFIX=`readlink -f $TOPDIR`/$DIST_INST_DIR
 			#export INSTALL_LOG=blah
@@ -566,7 +566,7 @@ upload_file()
 		esac
 	esac
 	echo "+ uploading $target"
-	RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
+	RSYNC_RSH=$SSH /bin/bash $JWB_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
 }
 
 upload_pkg()
@@ -1068,7 +1068,7 @@ while [ ${1:0:1} = - ]; do
 		shift
 		;;
 	-m)
-		eval MOD_SCRIPT_DIR=\"$2\"
+		eval JWB_SCRIPT_DIR=\"$2\"
 		shift
 		;;
 	-N)
@@ -1127,13 +1127,13 @@ while [ ${1:0:1} = - ]; do
 	shift
 done
 
-[ "$MOD_SCRIPT_DIR" ]  || MOD_SCRIPT_DIR=`dirname $0`
+[ "$JWB_SCRIPT_DIR" ]  || JWB_SCRIPT_DIR=`dirname $0`
 [ "$PROJECT" ] || PROJECT=`abspath $TOPDIR | xargs basename`
 
 cmd=$1
 shift
 
-export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
+export JWB_SCRIPT_DIR=`readlink -f $JWB_SCRIPT_DIR`
 export PKG_SH=`readlink -f $0`
 
 
@@ -1157,7 +1157,7 @@ rpm)
 	RPM=/bin/rpm
 	;;
 deb|debian)
-	RPM="/bin/bash $MOD_SCRIPT_DIR/dpm.sh"
+	RPM="/bin/bash $JWB_SCRIPT_DIR/dpm.sh"
 	;;
 *)
 	fatal "Unknown package format \"$PKG_FORMAT\""