[PATCH libaio 09/11] build: Fix DESTDIR handling

The convention for DESTDIR is that it is only prefixed during the
install target. In this case we postpone that to the inner Makefile
so that it can be invoked directly while preserving the expected
semantics.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
Gbp-Pq: Name 0009-build-Fix-DESTDIR-handling.patch

diff --git a/Makefile b/Makefile
index c1fb831bc6e72db9af0332966d8c6dd9af6290cc..e48b520c5e2bdae6d51c11571d699b85a2c5e2af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE))
 TAG = $(NAME)-$(VERSION)
 RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
 
+DESTDIR=
 prefix=/usr
 includedir=$(prefix)/include
 libdir=$(prefix)/lib
@@ -14,7 +15,12 @@ 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) \
+         $(nil)
 
 check:
        @$(MAKE) -C harness check

diff --git a/src/Makefile b/src/Makefile
index 37ae219a83c0c72390804a6126324eaede8d652e..a53c43c8fef0f8638f5c4f757a2b5f89d32e32be 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,4 @@
+DESTDIR=
 prefix=/usr
 includedir=$(prefix)/include
 libdir=$(prefix)/lib
@@ -58,12 +59,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)$(libdir)/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)$(libdir)/libaio.so
 endif
 
 $(libaio_objs): libaio.h