janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs.mk, pkg.sh: Move log_install.sh as command into pkg.sh

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-05-31 13:31:48 +00:00
commit a9c8eadd18
2 changed files with 198 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/defs.mk
View file

@ -618,6 +618,7 @@ GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
RM = rm
AR = ar
LOG_INSTALL_SH = $(MOD_SCRIPT_DIR)/pkg.sh log-install
ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES
@ -625,18 +626,18 @@ ifeq ($(LOG_THREAD_NAMES), true)
endif
ifdef INSTALL_LINK
INSTALL = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA
LINK_LIB = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA
INSTALL = sudo $(LOG_INSTALL_SH) -LA
LINK_LIB = sudo $(LOG_INSTALL_SH) -LA
else
ifdef INSTALL_LOG
INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -p -l $(INSTALL_LOG)
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG)
INSTALL=$(LOG_INSTALL_SH) -p -l $(INSTALL_LOG)
LINK_LIB=$(LOG_INSTALL_SH) -L -l $(INSTALL_LOG)
else
ifndef INSTALL
INSTALL = install
endif
ifndef LINK_LIB
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L
LINK_LIB=$(LOG_INSTALL_SH) -L
endif
endif
endif