janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 21:13:56 +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

10
make/doxygen.mk
View file

@ -1,4 +1,4 @@
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
# broken by IMAGEDIR in rpmbuild
@ -7,13 +7,13 @@ GENERATE_DOXYGEN ?= true
endif
ifneq ($(GENERATE_DOXYGEN),true)
include $(MODDIR)/make/dummy.mk
include $(JWBDIR)/make/dummy.mk
else
UPLOAD_FILE_MODE ?= 644
UPLOAD_DIR_MODE ?= 755
include $(MODDIR)/make/upload-defs.mk
include $(JWBDIR)/make/upload-defs.mk
UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
@ -23,7 +23,7 @@ DX_OUTPUT_DIR ?= html
DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel
DX_DOC_FILES = $(DX_INCLUDE)
DX_DOXYGEN_CONF ?= doxygen.conf
DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen
DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen
DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl
DX_BROWSER ?= $(BROWSER)
@ -91,7 +91,7 @@ $(DX_DOXYGEN_CONF): $(firstword $(wildcard $(DX_DOXYGEN_CONF).tmpl $(DX_FALLBACK
s%__PROJECT_SUMMARY__%$(PROJECT_SUMMARY)%g; \
s/__OUTPUT_DIR__/$(DX_OUTPUT_DIR)/g; \
s%__PROJECT_TOPDIR__%$(TOPDIR)%g; \
s%__MODDIR__%$(MODDIR)%g; \
s%__JWBDIR__%$(JWBDIR)%g; \
s%__FILE_PATTERNS__%$(DX_FILE_PATTERNS)%g; \
s%__INPUT_DIRS__%$(DX_INPUT_DIRS)%g; \
s%__SRC_IS_JAVA__%$(DX_SRC_IS_JAVA)%g; \