bitkeeper revision 1.1159.223.51 (41fac87bR5uD5TAFu58tuaTMLSmbrw)

Fix makefiles creating copies instead of symlinks of shared libs.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@intel.com>

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index e27556349ebc385ac0f33a2dd1dadb0623956c27..6369785d6821e979f82b4a1483d8eaf725aec486 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -68,7 +68,7 @@ mk-symlinks:
 install: all
        [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
        [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+       $(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
        ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
        ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
        $(INSTALL_DATA) xc.h $(DESTDIR)/usr/include

diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index 70d2a02c1986c38e71762dfa46329e9cad5cc550..cb12a93251c90965181aeb26e1ffc69a6c982604 100644 (file)
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -64,7 +64,7 @@ check-for-zlib:
 
 install: all
        [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
-       $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+       $(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
        ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
        ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so