diff -uNr xfs-cmds.orig/acl/Makefile xfs-cmds/acl/Makefile
--- xfs-cmds.orig/acl/Makefile	2004-11-14 13:46:53.000000000 +0100
+++ xfs-cmds/acl/Makefile	2004-11-14 15:44:49.000000000 +0100
@@ -32,6 +32,7 @@
 
 TOPDIR = .
 HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HW_PLAT = $(shell /bin/uname --hardware-platform)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
@@ -60,6 +61,12 @@
 clean:	# if configure hasn't run, nothing to clean
 endif
 
+ifeq ($(HW_PLAT), x86_64)
+HW_LIB = lib64
+else
+HW_LIB = lib
+endif
+
 $(CONFIGURE):
 	autoconf
 	./configure \
@@ -67,8 +74,8 @@
 		--exec-prefix=/ \
 		--sbindir=/bin \
 		--bindir=/usr/bin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/$(HW_LIB) \
+		--libexecdir=/usr/$(HW_LIB) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
diff -uNr xfs-cmds.orig/attr/Makefile xfs-cmds/attr/Makefile
--- xfs-cmds.orig/attr/Makefile	2004-11-14 13:46:56.000000000 +0100
+++ xfs-cmds/attr/Makefile	2004-11-14 15:43:03.000000000 +0100
@@ -32,6 +32,7 @@
 
 TOPDIR = .
 HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HW_PLAT = $(shell /bin/uname --hardware-platform)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
@@ -60,6 +61,12 @@
 clean:	# if configure hasn't run, nothing to clean
 endif
 
+ifeq ($(HW_PLAT), x86_64)
+HW_LIB = lib64
+else
+HW_LIB = lib
+endif
+
 $(CONFIGURE):
 	autoconf
 	./configure \
@@ -67,8 +74,8 @@
 		--exec-prefix=/ \
 		--sbindir=/bin \
 		--bindir=/usr/bin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/$(HW_LIB) \
+		--libexecdir=/usr/$(HW_LIB) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
diff -uNr xfs-cmds.orig/dmapi/Makefile xfs-cmds/dmapi/Makefile
--- xfs-cmds.orig/dmapi/Makefile	2004-11-14 13:46:58.000000000 +0100
+++ xfs-cmds/dmapi/Makefile	2004-11-14 15:42:24.000000000 +0100
@@ -32,6 +32,7 @@
 
 TOPDIR = .
 HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HW_PLAT = $(shell /bin/uname --hardware-platform)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
@@ -58,6 +59,12 @@
 clean:	# if configure hasn't run, nothing to clean
 endif
 
+ifeq ($(HW_PLAT), x86_64)
+HW_LIB = lib64
+else
+HW_LIB = lib
+endif
+
 $(CONFIGURE):
 	autoconf
 	./configure \
@@ -65,8 +72,8 @@
 		--exec-prefix=/ \
 		--sbindir=/bin \
 		--bindir=/usr/bin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/$(HW_LIB) \
+		--libexecdir=/usr/$(HW_LIB) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
diff -uNr xfs-cmds.orig/xfsdump/Makefile xfs-cmds/xfsdump/Makefile
--- xfs-cmds.orig/xfsdump/Makefile	2004-11-14 13:46:58.000000000 +0100
+++ xfs-cmds/xfsdump/Makefile	2004-11-14 15:58:13.000000000 +0100
@@ -32,6 +32,7 @@
 
 TOPDIR = .
 HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HW_PLAT = $(shell /bin/uname --hardware-platform)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
@@ -60,6 +61,12 @@
 clean:	# if configure hasn't run, nothing to clean
 endif
 
+ifeq ($(HW_PLAT), x86_64)
+HW_LIB = lib64
+else
+HW_LIB = lib
+endif
+
 $(CONFIGURE):
 	autoconf
 	./configure \
@@ -67,8 +74,8 @@
 		--exec-prefix=/ \
 		--sbindir=/sbin \
 		--bindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/$(HW_LIB) \
+		--libexecdir=/usr/$(HW_LIB) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
diff -uNr xfs-cmds.orig/xfsprogs/Makefile xfs-cmds/xfsprogs/Makefile
--- xfs-cmds.orig/xfsprogs/Makefile	2004-11-14 13:47:01.000000000 +0100
+++ xfs-cmds/xfsprogs/Makefile	2004-11-14 15:44:47.000000000 +0100
@@ -32,6 +32,7 @@
 
 TOPDIR = .
 HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HW_PLAT = $(shell /bin/uname --hardware-platform)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
@@ -60,6 +61,12 @@
 clean:	# if configure hasn't run, nothing to clean
 endif
 
+ifeq ($(HW_PLAT), x86_64)
+HW_LIB = lib64
+else
+HW_LIB = lib
+endif
+
 $(CONFIGURE):
 	autoconf
 	./configure \
@@ -67,8 +74,8 @@
 		--exec-prefix=/ \
 		--sbindir=/sbin \
 		--bindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/$(HW_LIB) \
+		--libexecdir=/usr/$(HW_LIB) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \