tools-console-prefix.diff

Patch-Name: tools-console-prefix.diff

Gbp-Pq: Name tools-console-prefix.diff

diff --git a/tools/console/Makefile b/tools/console/Makefile
index c8b030038bb811e11d78e82d4e32d1449ca8c89a..df0a6436204fade5497456004b4815321216d399 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -8,6 +8,7 @@ CFLAGS  += $(CFLAGS_libxenstore)
 LDLIBS += $(LDLIBS_libxenctrl)
 LDLIBS += $(LDLIBS_libxenstore)
 LDLIBS += $(SOCKET_LIBS)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
 
 LDLIBS_xenconsoled += $(UTIL_LIBS)
 LDLIBS_xenconsoled += -lrt
@@ -44,9 +45,7 @@ $(eval $(genpath-target))
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) $(DESTDIR)/$(sbindir)
-       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
-       $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(LIBEXEC_BIN)
 
 -include $(DEPS)