aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile8
-rw-r--r--config/StdGNU.mk4
-rw-r--r--config/SunOS.mk7
-rw-r--r--config/ia64.mk2
-rw-r--r--config/powerpc64.mk1
-rw-r--r--config/x86_32.mk1
-rw-r--r--config/x86_64.mk5
-rw-r--r--tools/blktap/lib/Makefile8
-rw-r--r--tools/console/Makefile2
-rw-r--r--tools/debugger/xenitp/Makefile5
-rw-r--r--tools/flask/libflask/Makefile10
-rw-r--r--tools/libfsimage/Rules.mk4
-rw-r--r--tools/libfsimage/common/Makefile8
-rw-r--r--tools/libxc/Makefile18
-rw-r--r--tools/libxen/Makefile10
-rw-r--r--tools/libxen/Makefile.dist10
-rw-r--r--tools/vnet/libxutil/Makefile10
-rw-r--r--tools/xcutils/Makefile2
-rw-r--r--tools/xenstore/Makefile10
-rw-r--r--tools/xentrace/Makefile5
20 files changed, 65 insertions, 65 deletions
diff --git a/Makefile b/Makefile
index 696b7dadd6..49fdca4dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -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 --git a/config/StdGNU.mk b/config/StdGNU.mk
index d493ba7170..0399eb1b4b 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -18,8 +18,8 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
INSTALL_PROG = $(INSTALL) -m0755 -p
PREFIX ?= /usr
-
-LIB64DIR = lib64
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib64
SOCKET_LIBS =
CURSES_LIBS = -lncurses
diff --git a/config/SunOS.mk b/config/SunOS.mk
index e84e277761..ce104473fd 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -19,14 +19,17 @@ INSTALL_DATA = $(INSTALL) -m0644 -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 --git a/config/ia64.mk b/config/ia64.mk
index db40adeb12..50edf6313d 100644
--- a/config/ia64.mk
+++ b/config/ia64.mk
@@ -4,5 +4,3 @@ CONFIG_IA64_$(XEN_OS) := y
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
CONFIG_XENCOMM := y
-
-LIBDIR := lib
diff --git a/config/powerpc64.mk b/config/powerpc64.mk
index cba68fec19..a49efd876b 100644
--- a/config/powerpc64.mk
+++ b/config/powerpc64.mk
@@ -4,4 +4,3 @@ CONFIG_POWERPC_$(XEN_OS) := y
CONFIG_XENCOMM := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
diff --git a/config/x86_32.mk b/config/x86_32.mk
index 9b8cee85b5..1f5cd6097d 100644
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -8,7 +8,6 @@ CONFIG_XCUTILS := y
CONFIG_IOEMU := y
CFLAGS += -m32 -march=i686
-LIBDIR := lib
# Use only if calling $(LD) directly.
LDFLAGS_DIRECT_OpenBSD = _obsd
diff --git a/config/x86_64.mk b/config/x86_64.mk
index 288878638c..64291837a4 100644
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -9,7 +9,10 @@ CONFIG_XCUTILS := 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 --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 2ed818311d..d06bbf9a9d 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -40,11 +40,11 @@ build: 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 --git a/tools/console/Makefile b/tools/console/Makefile
index d612419732..22df982915 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -3,7 +3,7 @@ XEN_ROOT=../..
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 --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index 21dd7eedb0..42be8f34c9 100644
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -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 --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index a29411f9d5..719e1f79d1 100644
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -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 --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index ca6380a4a1..71d59efae9 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -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 --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 5c22fa974d..ddf1d6a145 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -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 --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 618b371615..7d0e9fa846 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -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 --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index 63ba11263d..8480e3a917 100644
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -56,11 +56,11 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
.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 --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist
index 0f4a8dbd75..6c76433de1 100644
--- a/tools/libxen/Makefile.dist
+++ b/tools/libxen/Makefile.dist
@@ -66,11 +66,11 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
.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 --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index 3d490f0971..0c8ef6bb73 100644
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -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 --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 5fe69eef39..9d70df4fba 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -11,7 +11,7 @@
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 --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index adbe605675..b1a8d570c4 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -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 --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index d4917e561e..2032405c9e 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 12:23:56 +0000