[Pkg-xen-changes] [xen] 44/69: tools-libfsimage-prefix.diff

[Ian James Campbell]

This is an automated email from the git hooks/post-receive script.

ijc pushed a commit to branch feature/bug805508
in repository xen.

commit bc0bf96348e2c683e2958453d837c45132671f96
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Jul 5 11:46:55 2014 +0200

    tools-libfsimage-prefix.diff
    
    Patch-Name: tools-libfsimage-prefix.diff
---
 tools/libfsimage/Rules.mk        | 3 ++-
 tools/libfsimage/common/Makefile | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index a0c6504..3e35fc7 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -3,10 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
 CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
 CFLAGS += -Werror -D_GNU_SOURCE
 LDFLAGS += -L../common/
+LDFLAGS += $(call LDFLAGS_RPATH,../..)
 
 PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
 
-FSDIR = $(libdir)/fs
+FSDIR = $(LIBEXEC_LIB)/fs
 
 FSLIB = fsimage.so
 
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 8357b0a..2043744 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,6 +1,8 @@
 XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
+CFLAGS += -DFSDIR="\"$(LIBEXEC_LIB)/fs\""
+
 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
 LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
 LDFLAGS = $(LDFLAGS-y)
@@ -19,9 +21,9 @@ all: $(LIB)
 
 .PHONY: install
 install: all
-	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_LIB)
 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
-	$(INSTALL_PROG) libfsimage.so $(DESTDIR)$(libdir)
+	$(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBEXEC_LIB)
 	$(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir)
 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir)
 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git