1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
Description: Fix installation of shared vs static libraries
Author: Guillem Jover <guillem@debian.org>
Origin: vendor
Forwarded: no
Last-Update: 2007-09-11
---
Makefile | 10 +++++++++-
src/Makefile | 12 +++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,11 @@ VERSION=$(shell awk '/Version:/ { print
TAG = $(NAME)-$(VERSION)
RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
+DESTDIR=
prefix=/usr
includedir=$(prefix)/include
libdir=$(prefix)/lib
+libdevdir=$(libdir)
default: all
@@ -14,7 +16,13 @@ all:
@$(MAKE) -C src
install:
- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
+ @$(MAKE) -C src install \
+ DESTDIR=$(DESTDIR) \
+ prefix=$(prefix) \
+ includedir=$(includedir) \
+ libdir=$(libdir) \
+ libdevdir=$(libdevdir) \
+ $(nil)
check:
@$(MAKE) -C harness check
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,8 @@
+DESTDIR=
prefix=/usr
includedir=$(prefix)/include
libdir=$(prefix)/lib
+libdevdir=$(libdir)
CFLAGS ?= -g -fomit-frame-pointer -O2
CFLAGS += -Wall -I. -fPIC
@@ -58,12 +60,12 @@ $(libname): $(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 $(includedir)/libaio.h
- install -D -m 644 libaio.a $(libdir)/libaio.a
+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
+ install -D -m 644 libaio.a $(DESTDIR)$(libdevdir)/libaio.a
ifeq ($(ENABLE_SHARED),1)
- install -D -m 755 $(libname) $(libdir)/$(libname)
- ln -sf $(libname) $(libdir)/$(soname)
- ln -sf $(libname) $(libdir)/libaio.so
+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
+ ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname)
+ ln -sf $(libname) $(DESTDIR)$(libdevdir)/libaio.so
endif
$(libaio_objs): libaio.h
|