janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

conf / scripts: Fix unprivileged "make install" #71

Merged
Jan Lindemann merged 3 commits from jan/feature/20260818-conf-scripts-fix-unprivileged-make-install into master 2026-08-18 17:38:18 +02:00 AGit
Conversation 0 Commits 3 Files changed 4 +11 -11
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/bash-completion.d/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR = ../.. TOPDIR = ../..
INSTALL_CFGDIR = $(ENV_PREFIX)/usr/share/bash-completion/completions INSTALL_CFGDIR = $(ROOT_PREFIX)/usr/share/bash-completion/completions
LOCAL_CFG = $(filter-out Makefile,$(wildcard *)) LOCAL_CFG = $(filter-out Makefile,$(wildcard *))
PACKAGE_INSTALL_DIR = false PACKAGE_INSTALL_DIR = false

10
make/defs.mk
View file

@ -184,7 +184,7 @@ 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
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
ifdef INSTALL_LINK ifdef INSTALL_LINK
@ -195,14 +195,14 @@ else ifdef INSTALL_SYMLINK
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS) LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else else
ifdef INSTALL_LOG ifdef INSTALL_LOG
INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS) INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) -f $(PKG_FORMAT) $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS) LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) -f $(PKG_FORMAT) $(LOG_INSTALL_EXTRA_OPTS)
else else
ifndef INSTALL ifndef INSTALL
ifeq ($(DEVELOPMENT),false) ifeq ($(DEVELOPMENT),false)
INSTALL = $(SUDO) install INSTALL = $(SUDO) $(LOG_INSTALL_SH) -p $(LOG_INSTALL_EXTRA_OPTS)
else else
INSTALL = install INSTALL = $(LOG_INSTALL_SH)
endif endif
endif endif
ifndef LINK_LIB ifndef LINK_LIB

2
scripts/pkg.sh
View file

@ -734,7 +734,7 @@ cmd_log_install()
local args="$*" local args="$*"
local c_format=rpm local c_format=rpm
local c_logfile=install.log local c_logfile=""
local c_mode_dir=false local c_mode_dir=false
local c_create_leading_dirs=false local c_create_leading_dirs=false
local c_group=`id -gn` local c_group=`id -gn`

2
scripts/usr-bin/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR = ../.. TOPDIR = ../..
TARGET_DIR = $(ENV_PREFIX)/usr/bin TARGET_DIR = $(ROOT_PREFIX)/usr/bin
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(JWBDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk