diff --git a/make/defs.mk b/make/defs.mk index c179ca6a..03e5de32 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -672,7 +672,8 @@ GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh RM = rm AR = ar -LOG_INSTALL_SH = $(MOD_SCRIPT_DIR)/pkg.sh log-install +PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh +LOG_INSTALL_SH = $(PKG_SH_EXE) log-install ifeq ($(LOG_THREAD_NAMES), true) BUILD_CFLAGS += -DSLOG_THREAD_NAMES diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 09f12cb1..32791fef 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -17,7 +17,7 @@ FTP_HOST ?= ftp.jannet.de FTP_HOST_LOGIN ?= root RPM_VERSION ?= $(DIST_VERSION) LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX) -LAST_RPM_VERSION ?= $(shell sh $(MOD_SCRIPT_DIR)/pkg.sh version \ +LAST_RPM_VERSION ?= $(shell $(PKG_SH_EXE) version \ -p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//') RPMBUILD ?= pkgbuild CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true @@ -78,7 +78,7 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/upload-rules.mk -PKG_SH = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh \ +PKG_SH = $(PKG_SH_EXE) \ -N $(RPM_PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ -m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT)