From f83aea80be6d9272c6ff087fc924765b279d4d8d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 23 Jun 2014 16:55:41 +0000 Subject: [PATCH] defs.mk, rules.mk: Add support for target link-in Signed-off-by: Jan Lindemann --- make/defs.mk | 21 +++++++++++++-------- make/rules.mk | 3 +++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 88385e44..20f6dc90 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -581,15 +581,20 @@ ifeq ($(LOG_THREAD_NAMES), true) BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES endif -ifdef INSTALL_LOG - INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG) - LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG) +ifdef INSTALL_LINK + INSTALL = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA + LINK_LIB = sudo $(MOD_SCRIPT_DIR)/log_install.sh -LA else - ifndef INSTALL - INSTALL = install - endif - ifndef LINK_LIB - LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L + ifdef INSTALL_LOG + INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG) + LINK_LIB=$(MOD_SCRIPT_DIR)/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 + endif endif endif diff --git a/make/rules.mk b/make/rules.mk index d1dcc9bd..556ada8f 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -29,6 +29,9 @@ installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS) installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH) +link-in: + DEVELOPMENT=false INSTALL_LINK=1 make install + pckgclean: rm -rf *.zip *.tar.gz *.rpm *.deb