summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2020-02-06 18:07:56 +0100
committerJens Axboe <axboe@kernel.dk>2020-02-06 12:11:08 -0700
commitb57dbc2d308a849bdd532c4b7348bbbfdbf381f4 (patch)
tree6320c486f0ae7851293a5d361e501386c6cad090
parentad428769bc85b2d02fac6e385baa58d2afe6effe (diff)
downloadliburing-b57dbc2d308a849bdd532c4b7348bbbfdbf381f4.tar.gz
liburing-b57dbc2d308a849bdd532c4b7348bbbfdbf381f4.tar.bz2
configure/Makefile: introduce libdevdir defaults to $(libdir)
This makes it possible to install runtime libraries to /lib/* and developement libraries to /usr/lib/* Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--Makefile7
-rwxr-xr-xconfigure9
-rw-r--r--src/Makefile5
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