tools-libfsimage-prefix.diff

\o/

diff --git a/tools/Rules.mk b/tools/Rules.mk
index a5229bb5acb409e493d8d4b978080809cf971632..6fd54fd9c8d815576f55bdf53d0f30cc59459d74 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -16,6 +16,8 @@ INSTALL = $(XEN_ROOT)/tools/cross-install
 
 LDFLAGS += $(PREPEND_LDFLAGS_XEN_TOOLS)
 
+LDFLAGS_RPATH = -Wl,-rpath,'$${ORIGIN}$(if $(1),/$(1))'
+
 XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 
 include $(XEN_ROOT)/tools/libs/uselibs.mk

diff --git a/tools/libfsimage/common.mk b/tools/libfsimage/common.mk
index 4fc8c66795994876e9ff77876fdf98142c5a0fa0..befbc1737abe320c44f284c48c0eacb87dd49afc 100644 (file)
--- a/tools/libfsimage/common.mk
+++ b/tools/libfsimage/common.mk
@@ -1,9 +1,10 @@
 include $(XEN_ROOT)/tools/Rules.mk
 
-FSDIR := $(libdir)/xenfsimage
+FSDIR := $(LIBEXEC_LIB)/xenfsimage
 CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
 CFLAGS += -D_GNU_SOURCE
 LDFLAGS += -L../common/
+LDFLAGS += $(call LDFLAGS_RPATH,../..)
 
 PIC_OBJS = $(patsubst %.c,%.opic,$(LIB_SRCS-y))
 

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 79f8cfd28e3b68e1081471cc89db78914ad158d8..4f1eaf9ac4bed1f5c59cee50b10121208ac610f7 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -4,6 +4,8 @@ include $(XEN_ROOT)/tools/libfsimage/common.mk
 MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile)
 MINOR = 0
 
+CFLAGS += -DFSDIR="\"$(LIBEXEC_LIB)/fs\""
+
 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
 LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
 LDFLAGS += $(LDFLAGS-y)
@@ -20,11 +22,11 @@ all: $(TARGETS)
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)$(libdir)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_LIB)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_PROG) libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
-       ln -sf libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
-       ln -sf libxenfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenfsimage.so
+       $(INSTALL_PROG) libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBEXEC_LIB)
+       ln -sf libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBEXEC_LIB)/libxenfsimage.so.$(MAJOR)
+       ln -sf libxenfsimage.so.$(MAJOR) $(DESTDIR)$(LIBEXEC_LIB)/libxenfsimage.so
        $(INSTALL_DATA) xenfsimage.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) xenfsimage_plugin.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) xenfsimage_grub.h $(DESTDIR)$(includedir)
@@ -34,9 +36,9 @@ uninstall:
        rm -f $(DESTDIR)$(includedir)/xenfsimage_grub.h
        rm -f $(DESTDIR)$(includedir)/xenfsimage_plugin.h
        rm -f $(DESTDIR)$(includedir)/xenfsimage.h
-       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so
-       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
-       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR).$(MINOR)
+       rm -f $(DESTDIR)$(LIBEXEC_LIB)/libxenfsimage.so
+       rm -f $(DESTDIR)$(LIBEXEC_LIB)/libxenfsimage.so.$(MAJOR)
+       rm -f $(DESTDIR)$(LIBEXEC_LIB)/libxenfsimage.so.$(MAJOR).$(MINOR)
 
 libxenfsimage.so: libxenfsimage.so.$(MAJOR)
        ln -sf $< $@