===== Config.mk 1.3 vs edited =====
--- 1.3/Config.mk	2005-04-02 15:18:08 -05:00
+++ edited/Config.mk	2005-04-15 17:53:38 -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)) 
===== Makefile 1.88 vs edited =====
--- 1.88/Makefile	2005-03-20 16:15:03 -05:00
+++ edited/Makefile	2005-04-15 17:53:04 -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*
===== tools/Rules.mk 1.13 vs edited =====
--- 1.13/tools/Rules.mk	2005-04-03 07:20:00 -04:00
+++ edited/tools/Rules.mk	2005-04-15 17:56:30 -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 $@ $<
===== tools/blktap/Makefile 1.6 vs edited =====
--- 1.6/tools/blktap/Makefile	2005-03-25 10:39:08 -05:00
+++ edited/tools/blktap/Makefile	2005-04-15 17:53:06 -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)
 
===== tools/libxc/Makefile 1.57 vs edited =====
--- 1.57/tools/libxc/Makefile	2005-04-04 12:55:14 -04:00
+++ edited/tools/libxc/Makefile	2005-04-15 17:53:05 -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
===== tools/libxutil/Makefile 1.25 vs edited =====
--- 1.25/tools/libxutil/Makefile	2005-03-20 16:15:03 -05:00
+++ edited/tools/libxutil/Makefile	2005-04-15 17:53:07 -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