From 36bdba26701e0a1d9ca8be1ada4e980f96cdd9f0 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 25 Sep 2015 16:30:34 -0400 Subject: [PATCH] build: move pkg-config files to pc dir and properly install libunivalue.pc --- Makefile.am | 3 +++ configure.ac | 4 ++-- {lib => pc}/libunivalue-uninstalled.pc.in | 0 {lib => pc}/libunivalue.pc.in | 0 4 files changed, 5 insertions(+), 2 deletions(-) rename {lib => pc}/libunivalue-uninstalled.pc.in (100%) rename {lib => pc}/libunivalue.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 7f501d7f66414..2800f466dc55b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,9 @@ noinst_HEADERS = lib/univalue_escapes.h lib_LTLIBRARIES = lib/libunivalue.la +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = pc/libunivalue.pc + lib_libunivalue_la_SOURCES = \ lib/univalue.cpp \ lib/univalue_read.cpp \ diff --git a/configure.ac b/configure.ac index 8f3fa31c666d5..6cd951622925a 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,8 @@ esac AC_CONFIG_FILES([ Makefile - lib/libunivalue.pc - lib/libunivalue-uninstalled.pc]) + pc/libunivalue.pc + pc/libunivalue-uninstalled.pc]) AC_SUBST(LIBTOOL_APP_LDFLAGS) AC_SUBST(BUILD_EXEEXT) diff --git a/lib/libunivalue-uninstalled.pc.in b/pc/libunivalue-uninstalled.pc.in similarity index 100% rename from lib/libunivalue-uninstalled.pc.in rename to pc/libunivalue-uninstalled.pc.in diff --git a/lib/libunivalue.pc.in b/pc/libunivalue.pc.in similarity index 100% rename from lib/libunivalue.pc.in rename to pc/libunivalue.pc.in