From e9b7ad256973c2b0fcc45ab7caba7bdb484a8854 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Fri, 9 Sep 2022 23:59:57 +0200 Subject: [PATCH] Makefile: Make variables Automake-compatible Also split libdir into shared and static variants to enable installing to different locations. Patch-Status: Submitted [https://github.com/kaniini/libucontext/pull/48] Signed-off-by: Ismael Luceno --- Makefile | 29 +++++++++++++++++------------ libucontext.pc.in | 5 +++-- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 405022bf8ccf..194ef0d25f25 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,13 @@ ifeq ($(ARCH),$(filter $(ARCH),arm64)) override ARCH = aarch64 endif -LIBDIR := /lib -INCLUDEDIR := /usr/include -PKGCONFIGDIR := /usr/lib/pkgconfig +prefix = /usr +libdir = ${prefix}/lib +shared_libdir = ${libdir} +static_libdir = ${libdir} +includedir = ${prefix}/include +pkgconfigdir = ${prefix}/lib/pkgconfig + CFLAGS ?= -ggdb3 -O2 -Wall CPPFLAGS := -Iinclude -Iarch/${ARCH} -Iarch/common ifneq ($(shell uname),Darwin) @@ -79,8 +83,8 @@ else endif LIBUCONTEXT_STATIC_NAME = libucontext.a LIBUCONTEXT_PC = libucontext.pc -LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} -LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} +LIBUCONTEXT_PATH = ${shared_libdir}/${LIBUCONTEXT_SONAME} +LIBUCONTEXT_STATIC_PATH = ${static_libdir}/${LIBUCONTEXT_STATIC_NAME} LIBUCONTEXT_HEADERS = \ include/libucontext/libucontext.h \ include/libucontext/bits.h @@ -89,8 +93,8 @@ LIBUCONTEXT_EXAMPLES = \ LIBUCONTEXT_POSIX_STATIC_NAME = libucontext_posix.a LIBUCONTEXT_POSIX_C_SRC = libucontext_posix.c LIBUCONTEXT_POSIX_OBJ = ${LIBUCONTEXT_POSIX_C_SRC:.c=.o} -LIBUCONTEXT_POSIX_PATH = ${LIBDIR}/${LIBUCONTEXT_POSIX_SONAME} -LIBUCONTEXT_POSIX_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_POSIX_STATIC_NAME} +LIBUCONTEXT_POSIX_PATH = ${shared_libdir}/${LIBUCONTEXT_POSIX_SONAME} +LIBUCONTEXT_POSIX_STATIC_PATH = ${static_libdir}/${LIBUCONTEXT_POSIX_STATIC_NAME} ifeq ($(FREESTANDING),yes) LIBUCONTEXT_POSIX_NAME = @@ -119,8 +123,9 @@ ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_PC}: libucontext.pc.in sed -e s:@LIBUCONTEXT_VERSION@:${LIBUCONTEXT_VERSION}:g \ - -e s:@LIBUCONTEXT_LIBDIR@:${LIBDIR}:g \ - -e s:@LIBUCONTEXT_INCLUDEDIR@:${INCLUDEDIR}:g $< > $@ + -e s:@LIBUCONTEXT_SHARED_LIBDIR@:${shared_libdir}:g \ + -e s:@LIBUCONTEXT_STATIC_LIBDIR@:${static_libdir}:g \ + -e s:@LIBUCONTEXT_INCLUDEDIR@:${includedir}:g $< > $@ MANPAGES_SYMLINKS_3 = \ libucontext_getcontext.3 \ @@ -204,12 +209,12 @@ clean: docs_clean install: all install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} - ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} + ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${shared_libdir}/${LIBUCONTEXT_NAME} for i in ${LIBUCONTEXT_HEADERS}; do \ destfn=$$(echo $$i | sed s:include/::g); \ - install -D -m644 $$i ${DESTDIR}${INCLUDEDIR}/$$destfn; \ + install -D -m644 $$i ${DESTDIR}${includedir}/$$destfn; \ done - install -D -m644 ${LIBUCONTEXT_PC} ${DESTDIR}${PKGCONFIGDIR}/${LIBUCONTEXT_PC} + install -D -m644 ${LIBUCONTEXT_PC} ${DESTDIR}${pkgconfigdir}/${LIBUCONTEXT_PC} if [ -n ${LIBUCONTEXT_POSIX_NAME} ]; then \ install -D -m755 ${LIBUCONTEXT_POSIX_NAME} ${DESTDIR}${LIBUCONTEXT_POSIX_PATH}; \ install -D -m644 ${LIBUCONTEXT_POSIX_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_POSIX_STATIC_PATH}; \ diff --git a/libucontext.pc.in b/libucontext.pc.in index 6288c7fbca13..10962d8590d5 100644 --- a/libucontext.pc.in +++ b/libucontext.pc.in @@ -1,8 +1,9 @@ -libdir=@LIBUCONTEXT_LIBDIR@ +libdir=@LIBUCONTEXT_SHARED_LIBDIR@ +static_libdir=@LIBUCONTEXT_STATIC_LIBDIR@ includedir=@LIBUCONTEXT_INCLUDEDIR@ Name: libucontext Version: @LIBUCONTEXT_VERSION@ Description: ucontext library implementation (standalone) -Libs: -L${libdir} -lucontext +Libs: -L${libdir} -L${static_libdir} -lucontext Cflags: -I${includedir} -- 2.37.3