From 0c3868b62ad05511458d18568aa7dc3c54a6dcb1 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 29 Jun 2010 13:10:31 -0400
Subject: Fix pkg-config file management when using gtk+-3.0.

---
 Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 092da4b0a3..990b2458da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,20 +7,22 @@ if ENABLE_GTK3
 %-$(INTERFACE_VERSION).pc: %.pc
 	 cp $< $@
 
-pkgconfig_DATA = 					\
+pkgconfig_in_files =					\
 	evolution-calendar-$(INTERFACE_VERSION).pc	\
 	evolution-mail-$(INTERFACE_VERSION).pc		\
 	evolution-plugin-$(INTERFACE_VERSION).pc	\
 	evolution-shell-$(INTERFACE_VERSION).pc
+pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(INTERFACE_VERSION).pc)
 else
 pkgconfig_DATA = 				\
 	evolution-calendar.pc			\
 	evolution-mail.pc			\
 	evolution-plugin.pc			\
 	evolution-shell.pc
-endif	
+endif
 
 EXTRA_DIST = 			\
+	$(pkgconfig_DATA)	\
 	AUTHORS			\
 	COPYING-DOCS		\
 	COPYING.LGPL2		\
@@ -39,8 +41,7 @@ EXTRA_DIST = 			\
 	intltool-extract.in	\
 	evolution-zip.in	\
 	gnome-doc-utils.make    \
-	gtk-doc.make		\
-	$(pkgconfig_DATA:.pc=.pc.in)
+	gtk-doc.make
 
 if ENABLE_SMIME
 SMIME_SUBDIR=smime
-- 
cgit v1.2.3