[evolution] Fix pkg-config file management when using gtk+-3.0.



commit 0c3868b62ad05511458d18568aa7dc3c54a6dcb1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jun 29 13:10:31 2010 -0400

    Fix pkg-config file management when using gtk+-3.0.

 Makefile.am |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 092da4b..990b245 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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]