From 4f64ab35d964f1cc636ff2eed5858a3710cff3ad Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Tue, 21 Jun 2016 17:27:17 +1000 Subject: [PATCH] build: use two-postfix pkg-config scheme --- Makefile.am | 2 -- configure.ac | 2 +- libcruft-util.pc.in => libcruft-util-system.pc.in | 0 m4/nc | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename libcruft-util.pc.in => libcruft-util-system.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 51bc13d6..d67fa3e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -361,8 +361,6 @@ pkglibdir = $(libdir)/ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcruft-util.pc -EXTRA_DIST += libcruft-util.pc.in libcruft-util-inline.pc.in - EXTRA_DIST += ${top_srcdir}/build-aux/wine-crlf.sh ############################################################################### diff --git a/configure.ac b/configure.ac index 044fa571..539ef344 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,7 @@ AC_SUBST(LIBS) # failure on a clean build AX_APPEND_FLAG([-include config.h]) -NC_SUBPACKAGE_PC([libcruft-util.pc]) +NC_SUBPACKAGE_PC([libcruft-util]) AC_CONFIG_FILES([ Doxyfile diff --git a/libcruft-util.pc.in b/libcruft-util-system.pc.in similarity index 100% rename from libcruft-util.pc.in rename to libcruft-util-system.pc.in diff --git a/m4/nc b/m4/nc index c028034a..ca18405d 160000 --- a/m4/nc +++ b/m4/nc @@ -1 +1 @@ -Subproject commit c028034a395077d08d5458ae605a05a26bf4fcf5 +Subproject commit ca18405d9167c2ceab1739aaeccf539b55714af9