|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] Apply PREFIX directly to LIBDIR.
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201012151 0
# Node ID 6ed9b42d1ec4e8b2a87f82d631daec4d5c33506d
# Parent d57a945469115d368c6aee156dad2ba26943603d
Apply PREFIX directly to LIBDIR.
Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
Makefile | 8 ++++----
config/StdGNU.mk | 4 ++--
config/SunOS.mk | 7 +++++--
config/ia64.mk | 2 --
config/powerpc64.mk | 1 -
config/x86_32.mk | 1 -
config/x86_64.mk | 5 ++++-
tools/blktap/lib/Makefile | 8 ++++----
tools/console/Makefile | 2 +-
tools/debugger/xenitp/Makefile | 5 ++---
tools/flask/libflask/Makefile | 10 +++++-----
tools/libfsimage/Rules.mk | 4 ++--
tools/libfsimage/common/Makefile | 8 ++++----
tools/libxc/Makefile | 18 +++++++++---------
tools/libxen/Makefile | 10 +++++-----
tools/libxen/Makefile.dist | 10 +++++-----
tools/vnet/libxutil/Makefile | 10 +++++-----
tools/xcutils/Makefile | 2 +-
tools/xenstore/Makefile | 10 +++++-----
tools/xentrace/Makefile | 5 ++---
20 files changed, 65 insertions(+), 65 deletions(-)
diff -r d57a94546911 -r 6ed9b42d1ec4 Makefile
--- a/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -188,10 +188,10 @@ uninstall:
rm -rf $(D)/usr/include/xenctrl.h $(D)/usr/include/xenguest.h
rm -rf $(D)/usr/include/xs_lib.h $(D)/usr/include/xs.h
rm -rf $(D)/usr/include/xen
- rm -rf $(D)/usr/$(LIBDIR)/libxenctrl* $(D)/usr/$(LIBDIR)/libxenguest*
- rm -rf $(D)/usr/$(LIBDIR)/libxenstore*
- rm -rf $(D)/usr/$(LIBDIR)/python/xen $(D)/usr/$(LIBDIR)/python/grub
- rm -rf $(D)/usr/$(LIBDIR)/xen/
+ rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
+ rm -rf $(D)$(LIBDIR)/libxenstore*
+ rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
+ rm -rf $(D)$(LIBDIR)/xen/
rm -rf $(D)/usr/lib/xen/
rm -rf $(D)/usr/local/sbin/setmask $(D)/usr/local/sbin/xen*
rm -rf $(D)/usr/sbin/xen* $(D)/usr/sbin/netfix $(D)/usr/sbin/xm
diff -r d57a94546911 -r 6ed9b42d1ec4 config/StdGNU.mk
--- a/config/StdGNU.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/StdGNU.mk Tue Jan 22 14:29:11 2008 +0000
@@ -18,8 +18,8 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
INSTALL_PROG = $(INSTALL) -m0755 -p
PREFIX ?= /usr
-
-LIB64DIR = lib64
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib64
SOCKET_LIBS =
CURSES_LIBS = -lncurses
diff -r d57a94546911 -r 6ed9b42d1ec4 config/SunOS.mk
--- a/config/SunOS.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/SunOS.mk Tue Jan 22 14:29:11 2008 +0000
@@ -19,14 +19,17 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
INSTALL_PROG = $(INSTALL) -m0755 -p
PREFIX ?= /usr
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib/amd64
-LIB64DIR = lib/amd64
+SunOS_LIBDIR = /usr/sfw/lib
+SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
SOCKET_LIBS = -lsocket
CURSES_LIBS = -lcurses
UTIL_LIBS =
SONAME_LDFLAG = -h
-SHLIB_CFLAGS = -R /usr/sfw/$(LIBDIR) -shared
+SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
ifneq ($(debug),y)
# Optimisation flags are overridable
diff -r d57a94546911 -r 6ed9b42d1ec4 config/ia64.mk
--- a/config/ia64.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/ia64.mk Tue Jan 22 14:29:11 2008 +0000
@@ -4,5 +4,3 @@ CONFIG_IOEMU := y
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
CONFIG_XENCOMM := y
-
-LIBDIR := lib
diff -r d57a94546911 -r 6ed9b42d1ec4 config/powerpc64.mk
--- a/config/powerpc64.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/powerpc64.mk Tue Jan 22 14:29:11 2008 +0000
@@ -4,4 +4,3 @@ CONFIG_XENCOMM := y
CONFIG_XENCOMM := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
diff -r d57a94546911 -r 6ed9b42d1ec4 config/x86_32.mk
--- a/config/x86_32.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/x86_32.mk Tue Jan 22 14:29:11 2008 +0000
@@ -8,7 +8,6 @@ CONFIG_IOEMU := y
CONFIG_IOEMU := y
CFLAGS += -m32 -march=i686
-LIBDIR := lib
# Use only if calling $(LD) directly.
LDFLAGS_DIRECT_OpenBSD = _obsd
diff -r d57a94546911 -r 6ed9b42d1ec4 config/x86_64.mk
--- a/config/x86_64.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/config/x86_64.mk Tue Jan 22 14:29:11 2008 +0000
@@ -9,7 +9,10 @@ CONFIG_IOEMU := y
CONFIG_IOEMU := y
CFLAGS += -m64
-LIBDIR = $(LIB64DIR)
+
+LIBDIR = $(LIBDIR_x86_64)
+
+SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
# Use only if calling $(LD) directly.
ifeq ($(XEN_OS),OpenBSD)
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/blktap/lib/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -40,11 +40,11 @@ libblktap: libblktap.a
libblktap: libblktap.a
install: all
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
- ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+ ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+ ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
clean:
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/console/Makefile
--- a/tools/console/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/console/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
include $(XEN_ROOT)/tools/Rules.mk
DAEMON_INSTALL_DIR = /usr/sbin
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
CFLAGS += -Werror
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/debugger/xenitp/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -27,14 +27,13 @@ build: $(BIN) $(LIBBIN)
.PHONY: install
install: build
[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
- [ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+ [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
[ -d $(DESTDIR)/usr/share/man/man1 ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
[ -d $(DESTDIR)/usr/share/man/man8 ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)/usr/$(LIBDIR)/xen/bin
+ [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(LIBDIR)/xen/bin
$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/flask/libflask/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -33,12 +33,12 @@ build:
.PHONY: install
install: build
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
- ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
+ $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+ ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+ ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
.PHONY: TAGS
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/libfsimage/Rules.mk
--- a/tools/libfsimage/Rules.mk Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/libfsimage/Rules.mk Tue Jan 22 14:29:11 2008 +0000
@@ -20,8 +20,8 @@ fs-all: $(FSLIB)
.PHONY: fs-install
fs-install: fs-all
- $(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
- $(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(FSDIR)
+ $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)
$(FSLIB): $(PIC_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage
$(FS_LIBDEPS)
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/libfsimage/common/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -22,11 +22,11 @@ all: $(LIB)
.PHONY: install
install: all
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
+ $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+ ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/libxc/Makefile
--- a/tools/libxc/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/libxc/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -103,18 +103,18 @@ check-for-zlib:
.PHONY: install
install: build
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
+ $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+ ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+ ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
+ $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+ ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+ ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
.PHONY: TAGS
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/libxen/Makefile
--- a/tools/libxen/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/libxen/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -56,11 +56,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
.PHONY: install
install: all
$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
- ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
- $(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+ ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+ $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
set -e; for i in $(LIBXENAPI_HDRS); do \
$(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
done
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/libxen/Makefile.dist
--- a/tools/libxen/Makefile.dist Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/libxen/Makefile.dist Tue Jan 22 14:29:11 2008 +0000
@@ -66,11 +66,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
.PHONY: install
install: all
$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
- ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
- $(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+ ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+ $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
set -e; for i in $(LIBXENAPI_HDRS); do \
$(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
done
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/vnet/libxutil/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -71,11 +71,11 @@ check-for-zlib:
.PHONY: install
install: build
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxutil.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
- ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxutil.a $(DESTDIR)$(LIBDIR)
+ ln -sf libxutil.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxutil.so.$(MAJOR)
+ ln -sf libxutil.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxutil.so
.PHONY: clean
clean:
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/xcutils/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -11,7 +11,7 @@ XEN_ROOT = ../..
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/xenstore/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -88,11 +88,11 @@ install: all
$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
- ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
- $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
+ ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
+ $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
diff -r d57a94546911 -r 6ed9b42d1ec4 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Tue Jan 22 14:27:22 2008 +0000
+++ b/tools/xentrace/Makefile Tue Jan 22 14:29:11 2008 +0000
@@ -36,14 +36,13 @@ build: $(BIN) $(LIBBIN)
.PHONY: install
install: build
[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
- [ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
- $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+ [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
[ -d $(DESTDIR)/usr/share/man/man1 ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
[ -d $(DESTDIR)/usr/share/man/man8 ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)/usr/$(LIBDIR)/xen/bin
+ [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(LIBDIR)/xen/bin
$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |