summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2020-02-07 15:42:12 +0100
committerJens Axboe <axboe@kernel.dk>2020-02-07 09:24:28 -0700
commit3e63af4f252e1dfc2cb736863d8db4a3821f48e4 (patch)
tree533fc6035a1eec7310e6267dc5bf2889bfbb5993
parente93e3414cc21374fa82584d3aa4838851aa1a46e (diff)
downloadliburing-3e63af4f252e1dfc2cb736863d8db4a3821f48e4.tar.gz
liburing-3e63af4f252e1dfc2cb736863d8db4a3821f48e4.tar.bz2
Fix liburing.so symlink source if libdir != libdevdir
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--Makefile6
-rwxr-xr-xconfigure8
-rw-r--r--debian/changelog6
-rw-r--r--src/Makefile2
4 files changed, 19 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3b582f1..05d5879 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,11 @@ endif
$< >$@
install: $(NAME).pc
- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) libdevdir=$(DESTDIR)$(libdevdir)
+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) \
+ includedir=$(DESTDIR)$(includedir) \
+ libdir=$(DESTDIR)$(libdir) \
+ libdevdir=$(DESTDIR)$(libdevdir) \
+ relativelibdir=$(relativelibdir)
$(INSTALL) -D -m 644 $(NAME).pc $(DESTDIR)$(libdevdir)/pkgconfig/$(NAME).pc
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man2
$(INSTALL) -m 644 man/*.2 $(DESTDIR)$(mandir)/man2
diff --git a/configure b/configure
index 9fb43b3..2fa393f 100755
--- a/configure
+++ b/configure
@@ -48,7 +48,7 @@ if test -z "$libdir"; then
libdir="$prefix/lib"
fi
if test -z "$libdevdir"; then
- libdevdir="$libdir"
+ libdevdir="$prefix/lib"
fi
if test -z "$mandir"; then
mandir="$prefix/man"
@@ -57,6 +57,11 @@ if test -z "$datadir"; then
datadir="$prefix/share"
fi
+if test x"$libdir" = x"$libdevdir"; then
+ relativelibdir=""
+else
+ relativelibdir="$libdir/"
+fi
if test "$show_help" = "yes"; then
cat <<EOF
@@ -178,6 +183,7 @@ print_and_output_mak "prefix" "$prefix"
print_and_output_mak "includedir" "$includedir"
print_and_output_mak "libdir" "$libdir"
print_and_output_mak "libdevdir" "$libdevdir"
+print_and_output_mak "relativelibdir" "$relativelibdir"
print_and_output_mak "mandir" "$mandir"
print_and_output_mak "datadir" "$datadir"
diff --git a/debian/changelog b/debian/changelog
index b9ee85c..f01b3a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+liburing (0.4-2) stable; urgency=low
+
+ * Fix /usr/lib/*/liburing.so symlink to /lib/*/liburing.so.1.0.4
+
+ -- Stefan Metzmacher <metze@samba.org> Fri, 07 Feb 2020 15:30:00 +0100
+
liburing (0.4-1) stable; urgency=low
* Package liburing-0.4 using a packaging layout similar to libaio1
diff --git a/src/Makefile b/src/Makefile
index 1466dd4..5d13c09 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -61,7 +61,7 @@ install: $(all_targets)
ifeq ($(ENABLE_SHARED),1)
install -D -m 755 $(libname) $(libdir)/$(libname)
ln -sf $(libname) $(libdir)/$(soname)
- ln -sf $(libname) $(libdevdir)/liburing.so
+ ln -sf $(relativelibdir)$(libname) $(libdevdir)/liburing.so
endif
$(liburing_objs): include/liburing.h