mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
bitkeeper revision 1.1305 (42603ffeunTyoZX2egpGvfR_Km2tBw)
[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@redhat.com> ===== Config.mk 1.3 vs edited =====
This commit is contained in:
katzj@redhat.com[iap10] committed
1 parent
fef1e0d218
commit
2cc5addc8f
7 files changed
+23
-16
No files matched your search
@@ -52,6 +52,7 @@ kaf24@plym.cl.cam.ac.uk
|
||||
kaf24@scramble.cl.cam.ac.uk
|
||||
kaf24@striker.cl.cam.ac.uk
|
||||
kaf24@viper.(none)
|
||||
katzj@redhat.com
|
||||
kmacy@shemp.lab.netapp.com
|
||||
laudney@eclipse.(none)
|
||||
leendert@watson.ibm.com
|
||||
|
||||
@@ -24,9 +24,15 @@ STRIP = $(CROSS_COMPILE)strip
|
||||
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))
|
||||
|
||||
@@ -163,7 +163,7 @@ uninstall: D=$(DESTDIR)
|
||||
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*
|
||||
|
||||
+2
-2
@@ -9,15 +9,15 @@ XEN_LIBXUTIL = $(XEN_ROOT)/tools/libxutil
|
||||
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 $@ $<
|
||||
|
||||
|
||||
@@ -73,9 +73,9 @@ mk-symlinks:
|
||||
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)
|
||||
|
||||
|
||||
@@ -69,12 +69,12 @@ mk-symlinks:
|
||||
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
|
||||
|
||||
@@ -63,11 +63,11 @@ check-for-zlib:
|
||||
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
|
||||
|
||||