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

defs.mk, rules.mk: Add support for target link-in

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-23 16:55:41 +00:00
commit f83aea80be
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
make/defs.mk
View file

@ -581,15 +581,20 @@ ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES
endif endif
ifdef INSTALL_LOG ifdef INSTALL_LINK
INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG) INSTALL = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG) LINK_LIB = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA
else else
ifndef INSTALL ifdef INSTALL_LOG
INSTALL = install INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG)
endif LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG)
ifndef LINK_LIB else
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L ifndef INSTALL
INSTALL = install
endif
ifndef LINK_LIB
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L
endif
endif endif
endif endif

3
make/rules.mk
View file

@ -29,6 +29,9 @@ installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS)
installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH) installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH)
link-in:
DEVELOPMENT=false INSTALL_LINK=1 make install
pckgclean: pckgclean:
rm -rf *.zip *.tar.gz *.rpm *.deb rm -rf *.zip *.tar.gz *.rpm *.deb