[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools: replace private LIBDIR with automake libdir

commit 93790b1c38f36661563fd2e4c0df1c84d1036fa5
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Mon May 11 15:24:54 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu May 21 15:12:11 2015 +0100

    tools: replace private LIBDIR with automake libdir
    
    Reuse automake variable instead of inventing a private variable.
    
    The result of this command:
     git grep -wnl LIBDIR | xargs sed -i 's@LIBDIR@libdir@g'
    
    Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Config.mk                                    |    4 ++--
 config/Paths.mk.in                           |    1 -
 tools/Makefile                               |   10 +++++-----
 tools/blktap2/control/Makefile               |    8 ++++----
 tools/blktap2/vhd/lib/Makefile               |    2 +-
 tools/hotplug/FreeBSD/rc.d/xencommons.in     |    2 +-
 tools/hotplug/Linux/xen-hotplug-common.sh.in |    2 +-
 tools/hotplug/NetBSD/rc.d/xen-watchdog       |    2 +-
 tools/hotplug/NetBSD/rc.d/xencommons.in      |    2 +-
 tools/hotplug/NetBSD/rc.d/xendomains         |    2 +-
 tools/libfsimage/Rules.mk                    |    2 +-
 tools/libfsimage/common/Makefile             |    8 ++++----
 tools/libvchan/Makefile                      |   10 +++++-----
 tools/libxc/Makefile                         |   18 +++++++++---------
 tools/libxl/Makefile                         |   18 +++++++++---------
 tools/xenstat/libxenstat/Makefile            |    8 ++++----
 tools/xenstore/Makefile                      |   10 +++++-----
 17 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/Config.mk b/Config.mk
index ec16961..46928ca 100644
--- a/Config.mk
+++ b/Config.mk
@@ -157,7 +157,7 @@ define move-if-changed
        if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi
 endef
 
-BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \
+BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \
                    XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
                    XEN_RUN_DIR XEN_PAGING_DIR
 
@@ -204,7 +204,7 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
 LDFLAGS += $(foreach i, $(PREPEND_LIB), -L$(i))
 CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i))
 ifeq ($(XEN_TOOLS_RPATH),y)
-LDFLAGS += -Wl,-rpath,$(LIBDIR)
+LDFLAGS += -Wl,-rpath,$(libdir)
 endif
 APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i))
 APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i))
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 8ca02bb..6db108a 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -37,7 +37,6 @@ LIBEXEC_INC              := $(LIBEXEC)/include
 SHAREDIR                 := @SHAREDIR@
 MAN1DIR                  := $(mandir)/man1
 MAN8DIR                  := $(mandir)/man8
-LIBDIR                   := $(libdir)
 DOCDIR                   := $(docdir)
 
 XEN_RUN_DIR              := @XEN_RUN_DIR@
diff --git a/tools/Makefile b/tools/Makefile
index 1e0c0a7..383d4ca 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -89,9 +89,9 @@ uninstall:
        rm -rf $(D)$(includedir)/xen
        rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl*
        rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h
-       rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
-       rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
-       rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
+       rm -rf $(D)$(libdir)/libxenctrl* $(D)$(libdir)/libxenguest*
+       rm -rf $(D)$(libdir)/libxenstore* $(D)$(libdir)/libxlutil*
+       rm -rf $(D)$(libdir)/python/xen $(D)$(libdir)/python/grub
        rm -rf $(D)$(LIBEXEC)
        rm -rf $(D)$(sbindir)/setmask
        rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm
@@ -117,8 +117,8 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
 endif
 
 ifeq ($(XEN_TOOLS_RPATH),y)
-QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(LIBDIR)
-IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(LIBDIR)"
+QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(libdir)
+IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(libdir)"
 else
 QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB)
 IOEMU_EXTRA_LDFLAGS :=
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index 9ae2e51..767f52a 100644
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -63,10 +63,10 @@ $(LIB_SHARED): $(CTL_PICS)
 install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
        $(INSTALL_DIR) -p $(DESTDIR)$(sbindir)
        $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir)
-       $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR)
-       ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
-       ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME)
+       $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(libdir)
+       $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(libdir)
+       ln -sf $(LIBSONAME) $(DESTDIR)$(libdir)/$(LIBNAME).so
+       ln -sf $(LIB_SHARED) $(DESTDIR)$(libdir)/$(LIBSONAME)
 
 clean:
        rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 3904e97..ab2d648 100644
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -10,7 +10,7 @@ LVM-UTIL-OBJ    := $(BLKTAP_ROOT)/lvm/lvm-util.o
 
 LIBVHD-BUILD    := libvhd.a
 
-INST-DIR         = $(LIBDIR)
+INST-DIR         = $(libdir)
 
 CFLAGS          += -Werror
 CFLAGS          += -Wno-unused
diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in 
b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index 0ef9af9..d453c6b 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -7,7 +7,7 @@
 
 . @XEN_SCRIPT_DIR@/hotplugpath.sh
 
-LD_LIBRARY_PATH="${LIBDIR}"
+LD_LIBRARY_PATH="${libdir}"
 export LD_LIBRARY_PATH
 
 name="xencommons"
diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in 
b/tools/hotplug/Linux/xen-hotplug-common.sh.in
index eee8845..40b933e 100644
--- a/tools/hotplug/Linux/xen-hotplug-common.sh.in
+++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in
@@ -31,7 +31,7 @@ dir=$(dirname "$0")
 exec 2>>/var/log/xen/xen-hotplug.log
 
 export 
PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
-export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH"
 export LANG="POSIX"
 unset $(set | grep ^LC_ | cut -d= -f1)
 
diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog 
b/tools/hotplug/NetBSD/rc.d/xen-watchdog
index 0941fe7..d2e2ab8 100644
--- a/tools/hotplug/NetBSD/rc.d/xen-watchdog
+++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog
@@ -11,7 +11,7 @@
 DIR=$(dirname "$0")
 . "${DIR}/xen-hotplugpath.sh"
 
-LD_LIBRARY_PATH="${LIBDIR}"
+LD_LIBRARY_PATH="${libdir}"
 export LD_LIBRARY_PATH
 
 name="xenwatchdog"
diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in 
b/tools/hotplug/NetBSD/rc.d/xencommons.in
index 8217ae8..d7552cd 100644
--- a/tools/hotplug/NetBSD/rc.d/xencommons.in
+++ b/tools/hotplug/NetBSD/rc.d/xencommons.in
@@ -8,7 +8,7 @@
 DIR=$(dirname "$0")
 . "${DIR}/xen-hotplugpath.sh"
 
-LD_LIBRARY_PATH="${LIBDIR}"
+LD_LIBRARY_PATH="${libdir}"
 export LD_LIBRARY_PATH
 
 name="xencommons"
diff --git a/tools/hotplug/NetBSD/rc.d/xendomains 
b/tools/hotplug/NetBSD/rc.d/xendomains
index 204a8f0..edc4495 100644
--- a/tools/hotplug/NetBSD/rc.d/xendomains
+++ b/tools/hotplug/NetBSD/rc.d/xendomains
@@ -30,7 +30,7 @@
 DIR=$(dirname "$0")
 . "${DIR}/xen-hotplugpath.sh"
 
-LD_LIBRARY_PATH="${LIBDIR}"
+LD_LIBRARY_PATH="${libdir}"
 export LD_LIBRARY_PATH
 
 name="xendomains"
diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index 8a23655..a0c6504 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -6,7 +6,7 @@ LDFLAGS += -L../common/
 
 PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
 
-FSDIR = $(LIBDIR)/fs
+FSDIR = $(libdir)/fs
 
 FSLIB = fsimage.so
 
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index a70219f..4840bc2 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -22,11 +22,11 @@ all: $(LIB)
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(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_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)$(includedir)
        $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir)
diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index 3ce7c10..3c50fe6 100644
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -42,13 +42,13 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       ln -sf libxenvchan.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR)
-       ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so
+       $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       ln -sf libxenvchan.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenvchan.so.$(MAJOR)
+       ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenvchan.so
        $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir)
-       $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(libdir)
 
 .PHONY: clean
 clean:
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index f686f41..55782c8 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -162,17 +162,17 @@ libs: $(LIB)
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
-       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
-       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) 
$(DESTDIR)$(LIBDIR)/libxenctrl.so
+       $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR)
+       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) 
$(DESTDIR)$(libdir)/libxenctrl.so
        $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h 
include/xentoollog.h $(DESTDIR)$(includedir)
-       $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
-       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
-       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) 
$(DESTDIR)$(LIBDIR)/libxenguest.so
+       $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR)
+       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) 
$(DESTDIR)$(libdir)/libxenguest.so
        $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir)
 
 .PHONY: TAGS
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index c8b47bc..cc9c152 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -257,7 +257,7 @@ $(PKG_CONFIG): % : %.in Makefile
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
@@ -265,14 +265,14 @@ install: all
        $(INSTALL_PROG) xl $(DESTDIR)$(sbindir)
        $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
-       $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
-       $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) 
$(DESTDIR)$(LIBDIR)/libxenlight.so
-       $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) 
$(DESTDIR)$(LIBDIR)
-       $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) 
$(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
-       $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) 
$(DESTDIR)$(LIBDIR)/libxlutil.so
-       $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR)
+       $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) 
$(DESTDIR)$(libdir)/libxenlight.so
+       $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(libdir)
+       $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) 
$(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) 
$(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR)
+       $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) 
$(DESTDIR)$(libdir)/libxlutil.so
+       $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir)
        $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h 
_libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h 
$(DESTDIR)$(includedir)
        $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
        $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
diff --git a/tools/xenstat/libxenstat/Makefile 
b/tools/xenstat/libxenstat/Makefile
index 3b58147..850d24a 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -57,10 +57,10 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR)
 .PHONY: install
 install: all
        $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir)
-       $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
-       $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       ln -sf libxenstat.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
-       ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so
+       $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a
+       $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       ln -sf libxenstat.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR)
+       ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstat.so
 
 PYLIB=bindings/swig/python/_xenstat.so
 PYMOD=bindings/swig/python/xenstat.py
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 4aec1f8..30f3b46 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -141,11 +141,11 @@ endif
        set -e ; for c in $(CLIENTS) ; do \
                ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
        done
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_SHLIB) 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_DIR) $(DESTDIR)$(libdir)
+       $(INSTALL_SHLIB) 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) include/xenstore.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) include/compat/xs.h 
$(DESTDIR)$(includedir)/xenstore-compat/xs.h
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.