From 0bde52df588e8969879a2cae51c3a4774ec62472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 13 Jan 2017 15:57:04 +0100 Subject: [PATCH] Version 1.2.7: fix build system to honor user vars Update the original repository, not the fork at voidlinux/musl-fts See #6 --- Makefile.am | 2 ++ configure.ac | 7 ++++--- musl-fts.pc.in | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index aaff1bb..d463ddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,3 +4,5 @@ lib_LTLIBRARIES = libfts.la libfts_la_SOURCES = fts.c libfts_la_HEADERS = fts.h libfts_ladir = $(includedir) + +pkgconfig_DATA = musl-fts.pc diff --git a/configure.ac b/configure.ac index fbff9cb..0d5e2d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,12 @@ dnl Process this file with autoconf to produce a configure script AC_PREREQ(2.69) -AC_INIT([fts], [1.2.5], [pullmoll@t-online.de]) +AC_INIT([fts], [1.2.7], [pullmoll@t-online.de]) AM_INIT_AUTOMAKE([1.15]) AC_CONFIG_MACRO_DIRS([m4]) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AC_PROG_CC -AC_PROG_LIBTOOL LT_INIT AC_CHECK_HEADERS(assert.h dirent.h errno.h fcntl.h stdlib.h string.h unistd.h sys/param.h sys/stat.h) @@ -27,5 +26,7 @@ AC_CHECK_MEMBERS([DIR.dd_fd, DIR.d_fd],,, #include ]) +PKG_INSTALLDIR + AC_CONFIG_FILES([Makefile musl-fts.pc]) AC_OUTPUT diff --git a/musl-fts.pc.in b/musl-fts.pc.in index 42bdd6c..7ac2e21 100644 --- a/musl-fts.pc.in +++ b/musl-fts.pc.in @@ -1,7 +1,7 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ Name: musl-fts Description: Implementation of fts(3) functions for musl libc