Move cairo.pc into src/.

Makefile.am

@@ -9,8 +9,7 @@ endif
 EXTRA_DIST = \
 	COPYING \
 	COPYING-LGPL-2.1 \
-	COPYING-MPL-1.1 \
-	cairo.pc.in
+	COPYING-MPL-1.1
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
@@ -27,9 +26,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = cairo.pc
-
 check-valgrind: all
 	$(MAKE) -C test check-valgrind
 
@@ -97,7 +93,7 @@ $(runtime_zip_file): install
 $(developer_zip_file): install
 	-rm $@
 	cd $(prefix); \
-	zip -r $@ include/cairo lib/libcairo.dll.a lib/cairo.lib lib/pkgconfig/cairo.pc share/gtk-doc/html/cairo
+	zip -r $@ include/cairo lib/libcairo.dll.a lib/cairo.lib lib/pkgconfig/cairo.pc lib/pkgconfig/cairo-*.pc share/gtk-doc/html/cairo
 
 zips: $(runtime_zip_file) $(developer_zip_file)
 

configure.in

@@ -722,7 +722,6 @@ fi
 dnl ===========================================================================
 
 AC_OUTPUT([
-cairo.pc
 Makefile
 pixman/Makefile
 pixman/src/Makefile
@@ -732,6 +731,7 @@ test/Makefile
 doc/Makefile
 doc/public/Makefile
 doc/public/version.xml
+src/cairo.pc
 ])
 
 dnl ===========================================================================

src/Makefile.am

@@ -5,6 +5,9 @@ font_subset_sources =				\
 	cairo-scaled-font-subsets.c		\
 	cairo-scaled-font-subsets-private.h
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = cairo.pc
+
 if CAIRO_HAS_PS_SURFACE
 libcairo_ps_headers = cairo-ps.h
 libcairo_ps_sources = cairo-ps-surface.c cairo-ps-test.h