From 1f122fae8288f00994e81b6f933dd3d60482b33e Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 29 Jun 2019 23:32:20 +0200 Subject: [PATCH] Rename the MODDIR makefile variable to JWBDIR Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the point. Signed-off-by: Jan Lindemann --- Makefile | 2 +- bin/Makefile | 2 +- conf/Makefile | 2 +- conf/profile/Makefile | 2 +- make/Makefile | 2 +- make/proj.mk | 2 +- scripts/Makefile | 2 +- test/Makefile | 2 +- test/mute-stdio/Makefile | 2 +- test/trim-src/Makefile | 2 +- tools/Makefile | 2 +- tools/python/Makefile | 2 +- tools/python/jwutils/Makefile | 2 +- tools/python/jwutils/algo/Makefile | 2 +- tools/python/jwutils/stree/Makefile | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 70c6f93..64feb21 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ TOPDIR = . include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/topdir.mk +include $(JWBDIR)/make/topdir.mk diff --git a/bin/Makefile b/bin/Makefile index ec53fd6..3238b59 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/bin.mk +include $(JWBDIR)/make/bin.mk diff --git a/conf/Makefile b/conf/Makefile index 2f00ade..a9018b5 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/conf/profile/Makefile b/conf/profile/Makefile index 6a9f784..638dfc9 100644 --- a/conf/profile/Makefile +++ b/conf/profile/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/profile.mk +include $(JWBDIR)/make/profile.mk diff --git a/make/Makefile b/make/Makefile index 7b0b68f..1578f20 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/make.mk +include $(JWBDIR)/make/make.mk diff --git a/make/proj.mk b/make/proj.mk index 86b1ac0..69b7e6b 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -5,6 +5,6 @@ DEV_PROJECTS_DIR ?= $(TOPDIR)/.. ifeq ($(TARGET),mingw) FLAVOUR_PATH_PREFIX = win32/ endif -MODDIR ?= $(firstword $(wildcard $(DEV_PROJECTS_DIR)/jw-build $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)jw-build)) +JWBDIR ?= $(firstword $(wildcard $(DEV_PROJECTS_DIR)/jw-build $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)jw-build)) USE_PROJECT_LIB = false diff --git a/scripts/Makefile b/scripts/Makefile index 2b85b66..5816d66 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/scripts.mk +include $(JWBDIR)/make/scripts.mk diff --git a/test/Makefile b/test/Makefile index 6e9f4ed..e9b4601 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/cleandirs.mk +include $(JWBDIR)/make/cleandirs.mk diff --git a/test/mute-stdio/Makefile b/test/mute-stdio/Makefile index 348baf5..fa609d2 100644 --- a/test/mute-stdio/Makefile +++ b/test/mute-stdio/Makefile @@ -1,5 +1,5 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/py-run.mk +include $(JWBDIR)/make/py-run.mk diff --git a/test/trim-src/Makefile b/test/trim-src/Makefile index 6fae84f..c10c093 100644 --- a/test/trim-src/Makefile +++ b/test/trim-src/Makefile @@ -7,7 +7,7 @@ EXE = $(TOPDIR)/scripts/trim-src.py EXE_ARGS = beautify $(INPUT) include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/py-run.mk +include $(JWBDIR)/make/py-run.mk run: $(INPUT) diff --git a/tools/Makefile b/tools/Makefile index 2f00ade..a9018b5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tools/python/Makefile b/tools/python/Makefile index a5f2187..b1ec41b 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tools/python/jwutils/Makefile b/tools/python/jwutils/Makefile index a45fe49..c3ddd38 100644 --- a/tools/python/jwutils/Makefile +++ b/tools/python/jwutils/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/py-mod.mk +include $(JWBDIR)/make/py-mod.mk diff --git a/tools/python/jwutils/algo/Makefile b/tools/python/jwutils/algo/Makefile index b77eb55..59b3ac1 100644 --- a/tools/python/jwutils/algo/Makefile +++ b/tools/python/jwutils/algo/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/py-mod.mk +include $(JWBDIR)/make/py-mod.mk diff --git a/tools/python/jwutils/stree/Makefile b/tools/python/jwutils/stree/Makefile index b77eb55..59b3ac1 100644 --- a/tools/python/jwutils/stree/Makefile +++ b/tools/python/jwutils/stree/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/py-mod.mk +include $(JWBDIR)/make/py-mod.mk