From: Stefan Metzmacher <metze@samba.org>
To: io-uring@vger.kernel.org
Cc: Stefan Metzmacher <metze@samba.org>
Subject: [PATCH v1 1/3] configure/Makefile: introduce libdevdir defaults to $(libdir)
Date: Thu, 6 Feb 2020 18:07:56 +0100 [thread overview]
Message-ID: <20200206170758.29285-1-metze@samba.org> (raw)
This makes it possible to install runtime libraries to
/lib/* and developement libraries to /usr/lib/*
Signed-off-by: Stefan Metzmacher <metze@samba.org>
---
Makefile | 7 +++++--
configure | 9 ++++++++-
src/Makefile | 5 +++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 89b3f1d..3b582f1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ all:
@$(MAKE) -C test
@$(MAKE) -C examples
+partcheck: all
+ @echo "make partcheck => TODO add tests with out kernel support"
+
runtests: all
@$(MAKE) -C test runtests
runtests-loop:
@@ -40,8 +43,8 @@ endif
$< >$@
install: $(NAME).pc
- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
- $(INSTALL) -D -m 644 $(NAME).pc $(DESTDIR)$(libdir)/pkgconfig/$(NAME).pc
+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) libdevdir=$(DESTDIR)$(libdevdir)
+ $(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 54cf5f6..9fb43b3 100755
--- a/configure
+++ b/configure
@@ -22,6 +22,8 @@ for opt do
;;
--libdir=*) libdir="$optarg"
;;
+ --libdevdir=*) libdevdir="$optarg"
+ ;;
--mandir=*) mandir="$optarg"
;;
--datadir=*) datadir="$optarg"
@@ -45,6 +47,9 @@ fi
if test -z "$libdir"; then
libdir="$prefix/lib"
fi
+if test -z "$libdevdir"; then
+ libdevdir="$libdir"
+fi
if test -z "$mandir"; then
mandir="$prefix/man"
fi
@@ -61,7 +66,8 @@ Options: [defaults in brackets after descriptions]
--help print this message
--prefix=PATH install in PATH [$prefix]
--includedir=PATH install headers in PATH [$includedir]
- --libdir=PATH install libraries in PATH [$libdir]
+ --libdir=PATH install runtime libraries in PATH [$libdir]
+ --libdevdir=PATH install developement libraries in PATH [$libdevdir]
--mandir=PATH install man pages in PATH [$mandir]
--datadir=PATH install shared data in PATH [$datadir]
EOF
@@ -171,6 +177,7 @@ print_and_output_mak() {
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 "mandir" "$mandir"
print_and_output_mak "datadir" "$datadir"
diff --git a/src/Makefile b/src/Makefile
index 47e0ba5..1466dd4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
prefix ?= /usr
includedir ?= $(prefix)/include
libdir ?= $(prefix)/lib
+libdevdir ?= $(prefix)/lib
CFLAGS ?= -g -fomit-frame-pointer -O2
override CFLAGS += -Wall -Iinclude/
@@ -56,11 +57,11 @@ install: $(all_targets)
install -D -m 644 include/liburing.h $(includedir)/liburing.h
install -D -m 644 include/liburing/compat.h $(includedir)/liburing/compat.h
install -D -m 644 include/liburing/barrier.h $(includedir)/liburing/barrier.h
- install -D -m 644 liburing.a $(libdir)/liburing.a
+ install -D -m 644 liburing.a $(libdevdir)/liburing.a
ifeq ($(ENABLE_SHARED),1)
install -D -m 755 $(libname) $(libdir)/$(libname)
ln -sf $(libname) $(libdir)/$(soname)
- ln -sf $(libname) $(libdir)/liburing.so
+ ln -sf $(libname) $(libdevdir)/liburing.so
endif
$(liburing_objs): include/liburing.h
--
2.17.1
next reply other threads:[~2020-02-06 17:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 17:07 Stefan Metzmacher [this message]
2020-02-06 17:07 ` [PATCH v1 2/3] debian: package liburing-0.4 and use a layout as the libaio package Stefan Metzmacher
2020-02-06 17:07 ` [PATCH v1 3/3] liburing.spec move to liburing-0.4 Stefan Metzmacher
2020-02-07 14:19 ` [PATCH v1 1/3] configure/Makefile: introduce libdevdir defaults to $(libdir) Stefan Metzmacher
2020-02-07 14:42 ` [PATCH v2] Fix liburing.so symlink source if libdir != libdevdir Stefan Metzmacher
2020-02-07 16:24 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206170758.29285-1-metze@samba.org \
--to=metze@samba.org \
--cc=io-uring@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.