diff mbox series

[07/13] trace-cmd: Remove making of ld.so.conf.d/trace.conf

Message ID 20201211171014.051912406@goodmis.org (mailing list archive)
State Accepted
Commit 196c16214d17648a9759a43bc2cf2a4c5554b60d
Headers show
Series trace-cmd: Clean ups to the Makefile for using external libraries | expand

Commit Message

Steven Rostedt Dec. 11, 2020, 5:08 p.m. UTC 
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

Updating the ld.conf.d directory is an unneeded maintenance burden for
installation. Simply make the libtracecmd.so be installed in the default
lib{64} directory instead, and not in its own trace-cmd/ directory within
the lib{64} directory.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 Makefile         |  4 ----
 scripts/utils.mk | 10 ----------
 2 files changed, 14 deletions(-)
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 3e07be45f84e..0c5da92b54b6 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,6 @@  HELP_DIR_SQ = '$(subst ','\'',$(HELP_DIR))'
 
 BASH_COMPLETE_DIR ?= $(etcdir)/bash_completion.d
 LD_SO_CONF_DIR ?= $(etcdir)/ld.so.conf.d
-TRACE_LD_FILE ?= trace.conf
 
 export PLUGIN_DIR_TRACEEVENT
 export PLUGIN_DIR_TRACECMD
@@ -468,17 +467,14 @@  install_traceevent: $(LIBTRACEEVENT_STATIC_BUILD)
 	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
 	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
-	$(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)/traceevent)
 
 install_tracefs: $(LIBTRACEFS_STATIC_BUILD)
 	$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
 	$(Q)$(call do_install,$(src)/include/tracefs/tracefs.h,$(includedir_SQ)/tracefs)
-	$(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)/tracefs)
 
 install_libs: libs $(INSTALL_TRACEEVENT) $(INSTALL_TRACEFS)
 	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
 	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
-	$(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)/trace-cmd)
 
 doc:
 	$(MAKE) -C $(src)/Documentation all
diff --git a/scripts/utils.mk b/scripts/utils.mk
index 2e79f1a6ca0e..1d090d8ac001 100644
--- a/scripts/utils.mk
+++ b/scripts/utils.mk
@@ -135,16 +135,6 @@  define do_install_data
 	$(INSTALL) -m 644 $1 '$(DESTDIR_SQ)$2'
 endef
 
-define do_install_ld
-	if [ -d '$(DESTDIR_SQ)$2' ]; then				\
-		$(print_install)					\
-		if ! grep -q $3 $(DESTDIR_SQ)$2/$1 2>/dev/null; then	\
-			echo '$3' >> $(DESTDIR_SQ)$2/$1;		\
-			ldconfig;					\
-		fi							\
-	fi
-endef
-
 define do_install_pkgconfig_file
 	if [ -n "${pkgconfig_dir}" ]; then 					\
 		$(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); 	\