ChangeSet 1.1305, 2005/04/15 23:28:14+01:00, katzj@xxxxxxxxxx
[PATCH] Install libraries into libdir
Attached makes it so that libxc and libxutil get installed
into /usr/lib64 instead of /usr/lib on x86_64.
Signed-off-by: Jeremy Katz <katzj@xxxxxxxxxx>
===== Config.mk 1.3 vs edited =====
Config.mk | 8 +++++++-
Makefile | 2 +-
tools/Rules.mk | 4 ++--
tools/blktap/Makefile | 4 ++--
tools/libxc/Makefile | 10 +++++-----
tools/libxutil/Makefile | 10 +++++-----
6 files changed, 22 insertions(+), 16 deletions(-)
diff -Nru a/Config.mk b/Config.mk
--- a/Config.mk 2005-04-15 19:03:49 -04:00
+++ b/Config.mk 2005-04-15 19:03:49 -04:00
@@ -24,9 +24,15 @@
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
+ifeq ($(XEN_TARGET_ARCH),x86_64)
+LIBDIR = lib64
+else
+LIBDIR = lib
+endif
+
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
-EXTRA_LIB += $(EXTRA_PREFIX)/lib
+EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
endif
LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2005-04-15 19:03:49 -04:00
+++ b/Makefile 2005-04-15 19:03:49 -04:00
@@ -163,7 +163,7 @@
uninstall:
[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
rm -rf $(D)/etc/init.d/xend*
- rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
+ rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
diff -Nru a/tools/Rules.mk b/tools/Rules.mk
--- a/tools/Rules.mk 2005-04-15 19:03:49 -04:00
+++ b/tools/Rules.mk 2005-04-15 19:03:49 -04:00
@@ -9,14 +9,14 @@
ifeq ($(XEN_TARGET_ARCH),x86_32)
CFLAGS += -m32 -march=i686
LDFLAGS += -m elf_i386
-X11_LDPATH = -L/usr/X11R6/lib
endif
ifeq ($(XEN_TARGET_ARCH),x86_64)
CFLAGS += -m64
LDFLAGS += -m elf_x86_64
-X11_LDPATH = -L/usr/X11R6/lib64
endif
+
+X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
%.opic: %.c
$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
diff -Nru a/tools/blktap/Makefile b/tools/blktap/Makefile
--- a/tools/blktap/Makefile 2005-04-15 19:03:49 -04:00
+++ b/tools/blktap/Makefile 2005-04-15 19:03:49 -04:00
@@ -73,9 +73,9 @@
ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
install: all
- $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
$(INSTALL_DIR) -p $(DESTDIR)/usr/include
- $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+ $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
$(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
$(INSTALL_PROG) blkdump blkcow blkimg blkcowimg blkgnbd blkcowgnbd
$(DESTDIR)/$(BLKTAP_INSTALL_DIR)
diff -Nru a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile 2005-04-15 19:03:49 -04:00
+++ b/tools/libxc/Makefile 2005-04-15 19:03:49 -04:00
@@ -69,12 +69,12 @@
ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
install: build
- [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
+ [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)
[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
- $(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
- $(INSTALL_DATA) libxc.a $(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_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+ $(INSTALL_DATA) libxc.a $(DESTDIR)/usr/$(LIBDIR)
+ ln -sf libxc.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxc.so.$(MAJOR)
+ ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so
$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
.PHONY: TAGS clean rpm install all
diff -Nru a/tools/libxutil/Makefile b/tools/libxutil/Makefile
--- a/tools/libxutil/Makefile 2005-04-15 19:03:49 -04:00
+++ b/tools/libxutil/Makefile 2005-04-15 19:03:49 -04:00
@@ -63,11 +63,11 @@
fi
install: build
- [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
- $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
- $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
- ln -sf libxutil.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/lib/libxutil.so.$(MAJOR)
- ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/lib/libxutil.so
+ [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p
$(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
clean:
$(RM) *.a *.so* *.o *.opic *.rpm
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home