ia64/xen-unstable

changeset 4544:3dac50183187

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 =====
author katzj@redhat.com[iap10]
date Fri Apr 15 22:28:14 2005 +0000 (2005-04-15)
parents 1e5599e62873
children 189085197f6d
files BitKeeper/etc/logging_ok Config.mk Makefile tools/Rules.mk tools/blktap/Makefile tools/libxc/Makefile tools/libxutil/Makefile
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Fri Apr 15 22:15:40 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Fri Apr 15 22:28:14 2005 +0000
     1.3 @@ -52,6 +52,7 @@ kaf24@plym.cl.cam.ac.uk
     1.4  kaf24@scramble.cl.cam.ac.uk
     1.5  kaf24@striker.cl.cam.ac.uk
     1.6  kaf24@viper.(none)
     1.7 +katzj@redhat.com
     1.8  kmacy@shemp.lab.netapp.com
     1.9  laudney@eclipse.(none)
    1.10  leendert@watson.ibm.com
     2.1 --- a/Config.mk	Fri Apr 15 22:15:40 2005 +0000
     2.2 +++ b/Config.mk	Fri Apr 15 22:28:14 2005 +0000
     2.3 @@ -24,9 +24,15 @@ STRIP      = $(CROSS_COMPILE)strip
     2.4  OBJCOPY    = $(CROSS_COMPILE)objcopy
     2.5  OBJDUMP    = $(CROSS_COMPILE)objdump
     2.6  
     2.7 +ifeq ($(XEN_TARGET_ARCH),x86_64)
     2.8 +LIBDIR = lib64
     2.9 +else
    2.10 +LIBDIR = lib
    2.11 +endif
    2.12 +
    2.13  ifneq ($(EXTRA_PREFIX),)
    2.14  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
    2.15 -EXTRA_LIB += $(EXTRA_PREFIX)/lib
    2.16 +EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
    2.17  endif
    2.18  
    2.19  LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
     3.1 --- a/Makefile	Fri Apr 15 22:15:40 2005 +0000
     3.2 +++ b/Makefile	Fri Apr 15 22:28:14 2005 +0000
     3.3 @@ -163,7 +163,7 @@ uninstall: D=$(DESTDIR)
     3.4  uninstall:
     3.5  	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
     3.6  	rm -rf $(D)/etc/init.d/xend*
     3.7 -	rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
     3.8 +	rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
     3.9  	rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
    3.10  	rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
    3.11  	rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
     4.1 --- a/tools/Rules.mk	Fri Apr 15 22:15:40 2005 +0000
     4.2 +++ b/tools/Rules.mk	Fri Apr 15 22:28:14 2005 +0000
     4.3 @@ -9,15 +9,15 @@ XEN_LIBXUTIL       = $(XEN_ROOT)/tools/l
     4.4  ifeq ($(XEN_TARGET_ARCH),x86_32)
     4.5  CFLAGS  += -m32 -march=i686
     4.6  LDFLAGS += -m elf_i386
     4.7 -X11_LDPATH = -L/usr/X11R6/lib
     4.8  endif
     4.9  
    4.10  ifeq ($(XEN_TARGET_ARCH),x86_64)
    4.11  CFLAGS  += -m64
    4.12  LDFLAGS += -m elf_x86_64
    4.13 -X11_LDPATH = -L/usr/X11R6/lib64
    4.14  endif
    4.15  
    4.16 +X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
    4.17 +
    4.18  %.opic: %.c
    4.19  	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    4.20  
     5.1 --- a/tools/blktap/Makefile	Fri Apr 15 22:15:40 2005 +0000
     5.2 +++ b/tools/blktap/Makefile	Fri Apr 15 22:28:14 2005 +0000
     5.3 @@ -73,9 +73,9 @@ mk-symlinks:
     5.4  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
     5.5  
     5.6  install: all
     5.7 -	$(INSTALL_DIR) -p $(DESTDIR)/usr/lib
     5.8 +	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
     5.9  	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
    5.10 -	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
    5.11 +	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
    5.12  	$(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
    5.13  	$(INSTALL_PROG) blkdump blkcow blkimg blkcowimg blkgnbd blkcowgnbd $(DESTDIR)/$(BLKTAP_INSTALL_DIR)
    5.14  
     6.1 --- a/tools/libxc/Makefile	Fri Apr 15 22:15:40 2005 +0000
     6.2 +++ b/tools/libxc/Makefile	Fri Apr 15 22:28:14 2005 +0000
     6.3 @@ -69,12 +69,12 @@ mk-symlinks:
     6.4  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
     6.5  
     6.6  install: build
     6.7 -	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
     6.8 +	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
     6.9  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
    6.10 -	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
    6.11 -	$(INSTALL_DATA) libxc.a $(DESTDIR)/usr/lib
    6.12 -	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
    6.13 -	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
    6.14 +	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    6.15 +	$(INSTALL_DATA) libxc.a $(DESTDIR)/usr/$(LIBDIR)
    6.16 +	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so.$(MAJOR)
    6.17 +	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so
    6.18  	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
    6.19  
    6.20  .PHONY: TAGS clean rpm install all
     7.1 --- a/tools/libxutil/Makefile	Fri Apr 15 22:15:40 2005 +0000
     7.2 +++ b/tools/libxutil/Makefile	Fri Apr 15 22:28:14 2005 +0000
     7.3 @@ -63,11 +63,11 @@ check-for-zlib:
     7.4  	fi
     7.5  
     7.6  install: build
     7.7 -	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
     7.8 -	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
     7.9 -	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
    7.10 -	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxutil.so.$(MAJOR)
    7.11 -	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/lib/libxutil.so
    7.12 +	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
    7.13 +	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    7.14 +	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
    7.15 +	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
    7.16 +	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
    7.17  
    7.18  clean:
    7.19  	$(RM) *.a *.so* *.o *.opic *.rpm