janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 17:23:36 +02:00
Code Activity Actions

defs.mk: Define Q and use it in *.mk

Browse source 
Define Q ?= @, and replace @<command> in recipes by $(Q)<command>.
Meant to be overridden from the environment for debugging as in

  Q= make

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-01-25 17:34:53 +01:00
commit f869b5aaca
15 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/rpmdist.mk
View file

@ -198,7 +198,7 @@ pkg-upload-local.dist: pkgbuild.dist
touch $@
pkginstall.dist: pkg-build.dist
@set -e; for p in $(BINARY_RPM); do \
$(Q)set -e; for p in $(BINARY_RPM); do \
if ! $(RPM) -q `basename $$p | $(SED) "s/[._]$(RPM_ARCH)\.$(RPM_SUFFIX)//; s/_\([0-9.-]\+\)$$/-\1/"` > /dev/null 2>&1 ; then \
echo + installing $$p ;\
sudo $(RPM) -U $$(realpath $$p); \
@ -214,7 +214,7 @@ pkginstall.dist: pkg-build.dist
# touch $@
pkguninstall.dist:
@set -e; for s in devel run; do \
$(Q)set -e; for s in devel run; do \
if $(RPM) -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \
echo + removing $(RPM_PROJECT)-$$s ;\
sudo $(RPM) -e $(RPM_PROJECT)-$$s --nodeps --allmatches; \
@ -312,13 +312,13 @@ md5:
echo $(HASH) > HASH
pkg-next-build:
@$(increase_build_number)
$(Q)$(increase_build_number)
try-reinstall:
$(check_reinstall_old)
pkg-update-release:
@if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
$(Q)if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
echo + source was modified ;\
$(increase_build_number) ;\
elif ! $(check_reinstall_old); then \
@ -327,7 +327,7 @@ pkg-update-release:
fi
pkg-check-release:
@if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
$(Q)if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
echo + source was modified ;\
else \
echo + source is unmodified ;\