[Pkg-xen-changes] [xen] 11/34: tools-libfsimage-prefix.diff
Ian James Campbell
ijc at moszumanska.debian.org
Tue Dec 9 12:49:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc pushed a commit to branch feature/experimental-rc3
in repository xen.
commit 57bc0eea136d271b495451bb9fe7b2acdca71409
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 8a23655..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 0e6c728..4e472f0 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
More information about the Pkg-xen-changes
mailing list