janware/jw-pkg
1
Code Pull requests Activity Actions

defs.mk: Minor code beautification

Browse source 
Uppercase some comments, and remove some dead code.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-18 12:36:15 +02:00
commit 04b5088ca4
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -12,7 +12,7 @@ space := $(empty) $(empty)
comma := , comma := ,
Q ?= @ Q ?= @
# ----- executables # ----- Executables
include $(JWBDIR)/make/projects.mk include $(JWBDIR)/make/projects.mk
@ -99,7 +99,7 @@ ifndef PRISTINE_MAKE
PRISTINE_MAKE := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE) PRISTINE_MAKE := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE)
endif endif
# ----- function definitions # ----- Function definitions
reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1)) reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
@ -123,7 +123,7 @@ endef
uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
# ----- standard variables # ----- Standard variables
ifeq ($(PROJECT),) ifeq ($(PROJECT),)
PROJECT := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9]\+\..*//') PROJECT := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9]\+\..*//')
@ -146,7 +146,7 @@ ifdef BUILD_LIBS_PREFIX
endif endif
endif endif
# ----- user and organization # ----- User and organization
ifndef BUILD_USER ifndef BUILD_USER
BUILD_USER := $(shell $(ID) -un) BUILD_USER := $(shell $(ID) -un)
@ -173,7 +173,7 @@ PUBLIC_PATH_DEVEL_DOC = /doc/devel
UPLOAD_URL_DEVEL_DOC = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC) UPLOAD_URL_DEVEL_DOC = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC)
PKG_VENDOR ?= janware GmbH PKG_VENDOR ?= janware GmbH
# ----- packaging variables # ----- Packaging variables
PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT) LOG_INSTALL_SH := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT)
@ -259,7 +259,7 @@ BUILD_NUMBER = $(word 4,$(DIST_VERSION_WORDS))
MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION) MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION)
CVS_RSH ?= /usr/bin/ssh CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- Input dirs
JW_PKG_DIR = $(JWBDIR) JW_PKG_DIR = $(JWBDIR)
JW_PKG_CONF_BASE_DIR ?= $(firstword $(wildcard $(JW_PKG_DIR)/conf /etc/opt/jw-pkg)) JW_PKG_CONF_BASE_DIR ?= $(firstword $(wildcard $(JW_PKG_DIR)/conf /etc/opt/jw-pkg))
@ -518,11 +518,11 @@ endif
# ----- local.mk # ----- local.mk
$(eval $(call try_include,$(JWBDIR)/make/local.mk)) $(eval $(call try_include,$(JWBDIR)/make/local.mk))
#-include $(JWBDIR)/make/local.mk
$(eval $(call try_include,$(TOPDIR)/make/local.mk)) $(eval $(call try_include,$(TOPDIR)/make/local.mk))
$(eval $(call try_include,local.mk)) $(eval $(call try_include,local.mk))
# ----- Omnipresent rules
all: all:
nothing: nothing: