From 75e8e55b63271218796c97b990801b91a87d08a0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 9 Jul 2003 23:08:50 +0000
Subject: fix /lib64 arches

---
 Makefile     |  7 ++++++-
 libaio.spec  | 12 +++++++-----
 src/Makefile | 10 ++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 41238ca..868de0a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,18 @@ RELEASE=$(shell awk '/Release:/ { print $$2 }' $(SPECFILE))
 CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
 RPM=rpm
 
+prefix=/usr
+includedir=$(prefix)/include
+libdir=$(prefix)/lib
+
 default: all
 
 all:
 	@$(MAKE) -C src
 
 install:
-	@$(MAKE) -C src install
+	@$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
+
 
 clean:
 	@$(MAKE) -C src clean
diff --git a/libaio.spec b/libaio.spec
index 91a2cba..4ca8748 100644
--- a/libaio.spec
+++ b/libaio.spec
@@ -35,7 +35,9 @@ make
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-make install prefix=$RPM_BUILD_ROOT/usr root=$RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT/usr \
+ libdir=$RPM_BUILD_ROOT/%{_libdir} \
+ root=$RPM_BUILD_ROOT
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -46,14 +48,14 @@ make install prefix=$RPM_BUILD_ROOT/usr root=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/lib/libaio.so.*
+%attr(0755,root,root) %{_libdir}/libaio.so.*
 %doc COPYING TODO
 
 %files devel
 %defattr(-,root,root)
-%attr(0644,root,root) /usr/include/*
-%attr(0755,root,root) /usr/lib/libaio.so
-%attr(0644,root,root) /usr/lib/libaio.a
+%attr(0644,root,root) %{_includedir}/*
+%attr(0755,root,root) %{_libdir}/libaio.so
+%attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
 * Wed Jun 18 2003 Michael K. Johnson <johnsonm@redhat.com> 0.3.96-2
diff --git a/src/Makefile b/src/Makefile
index 4a86b4d..3d3e6cd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,6 @@
 prefix=/usr
+includedir=$(prefix)/include
+libdir=$(prefix)/lib
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/)
 CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2
@@ -47,10 +49,10 @@ $(soname): $(libaio_sobjs) libaio.map
 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
 
 install: $(all_targets)
-	install -D -m 644 libaio.h $(prefix)/include/libaio.h
-	install -D -m 644 libaio.a $(prefix)/lib/libaio.a
-	install -D -m 755 $(soname) $(prefix)/lib/$(soname)
-	ln -sf $(soname) $(prefix)/lib/libaio.so
+	install -D -m 644 libaio.h $(includedir)/libaio.h
+	install -D -m 644 libaio.a $(libdir)/libaio.a
+	install -D -m 755 $(soname) $(libdir)/$(soname)
+	ln -sf $(soname) $(libdir)/libaio.so
 
 $(libaio_objs): libaio.h
 
-- 
cgit v1.2.1