From bdedeb26d3ffadb8fa19df47f65dadc2940deb5c Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 5 Jul 2014 11:46:55 +0200 Subject: [PATCH] tools-libfsimage-prefix.diff Patch-Name: tools-libfsimage-prefix.diff Gbp-Pq: 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 a0c6504947..3e35fc7afc 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 8357b0a1fc..20437444a9 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) -- 2.30.2