From 8a509ec2a41244b906912dcdeba838cd844b5916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 10 Dec 2015 17:04:34 +0800 Subject: [PATCH] pc: Include MAJORMINOR in the .pc filename --- .gitignore | 2 +- Makefile.am | 3 ++- configure.ac | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f3e069e8..86a4c37ec 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ missing mkinstalldirs stamp-* .dirstamp -pkgconfig/libpinos.pc +pkgconfig/libpinos-*.pc src/client/enumtypes.c src/client/enumtypes.h diff --git a/Makefile.am b/Makefile.am index 6ffbfe946..7f4928d4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,8 @@ MAINTAINERCLEANFILES = noinst_DATA = pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = pkgconfig/libpinos.pc +pkgconfig_DATA = pkgconfig/libpinos-$(PINOS_MAJORMINOR).pc + eolspace: find \( -name '*.c' -o -name '*.h' -o -name 'Makefile.am' \) -exec perl -i -pe 's/\s+\n$$/\1\n/;' \{\} \; diff --git a/configure.ac b/configure.ac index 370ee6247..0a5ce9273 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,7 @@ src/Makefile man/Makefile man/pinos.1.xml man/pinos-monitor.1.xml -pkgconfig/libpinos.pc +pkgconfig/libpinos-$PINOS_MAJORMINOR.pc:pkgconfig/libpinos.pc.in po/Makefile.in ]) AC_OUTPUT