From a4ab16365e0c57aaf74e61b4a829162d19b5e87d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sat, 23 May 2015 08:24:10 +0000 Subject: [PATCH] xentrace: install into sbin Collecting the trace buffer requires root permissions. Adjust Makefile to install xentrace and xentrace_setsize into sbindir. Leave the existing support for BIN in place for upcoming changes. Signed-off-by: Olaf Hering Cc: George Dunlap Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu Acked-by: George Dunlap --- tools/xentrace/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 8b8054142c..5360960263 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,8 @@ CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) -BIN = xentrace xentrace_setsize +BIN = +SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format MAN1 = $(wildcard *.1) @@ -16,15 +17,16 @@ MAN8 = $(wildcard *.8) all: build .PHONY: build -build: $(BIN) $(LIBBIN) +build: $(BIN) $(SBIN) $(LIBBIN) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) @@ -32,7 +34,7 @@ install: build .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS) + $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS) .PHONY: distclean distclean: clean -- 2.30.2