[Pkg-xen-changes] [xen] 55/70: tools-xenstore-prefix.diff
Ian James Campbell
ijc at moszumanska.debian.org
Thu Dec 17 14:44:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
ijc pushed a commit to branch feature/bug805508
in repository xen.
commit 6c48ac31b17ad45afdeefde256e0d8b85748e216
Author: Bastian Blank <waldi at debian.org>
Date: Sat Jul 5 11:47:12 2014 +0200
tools-xenstore-prefix.diff
Patch-Name: tools-xenstore-prefix.diff
---
tools/xenstore/Makefile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 1b4a494..f837c6e 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -18,6 +18,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
CFLAGS += $(CFLAGS-y)
LDFLAGS += $(LDFLAGS-y)
+LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
+
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
CLIENTS += xenstore-write xenstore-ls xenstore-watch
@@ -75,10 +77,10 @@ endif
init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest)
init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE)
- $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS)
+ $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
xenstored: $(XENSTORED_OBJS)
- $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
+ $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
xenstored.a: $(XENSTORED_OBJS)
$(AR) cr $@ $^
@@ -131,13 +133,13 @@ tarball: clean
install: all
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat
ifeq ($(XENSTORE_XENSTORED),y)
- $(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
- $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir)
+ $(INSTALL_PROG) xenstored $(DESTDIR)$(LIBEXEC_BIN)
endif
- $(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
set -e ; for c in $(CLIENTS) ; do \
ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list