From c5d8527fcd167eedd4556fa606c645e7bd702cab Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Wed, 3 Jun 2009 17:19:43 -0400 Subject: [PATCH] Fix Bug 584775: build system installs "uninstalled" version of the packages Don't install -uninstalled.pc files --- Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 529a5b2..11701a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = tidy champlain docs/reference ACLOCAL_AMFLAGS = -I m4 -pcfiles = champlain-@API_VERSION@.pc champlain-@API_VERSION@-uninstalled.pc +pcfiles = champlain-@API_VERSION@.pc +other_pcfiles = champlain-@API_VERSION@-uninstalled.pc champlain-@API_VERSION@.pc: champlain.pc @cp -f $< $@ champlain-@API_VERSION@-uninstalled.pc: champlain-uninstalled.pc @@ -10,9 +11,10 @@ champlain-@API_VERSION@-uninstalled.pc: champlain-uninstalled.pc if ENABLE_GTK SUBDIRS += champlain-gtk docs/reference-gtk -pcfiles += champlain-gtk-@API_VERSION@.pc champlain-gtk-@API_VERSION@-uninstalled.pc +pcfiles += champlain-gtk-@API_VERSION@.pc champlain-gtk-@API_VERSION@.pc: champlain-gtk.pc @cp -f $< $@ +other_pcfiles += champlain-gtk-@API_VERSION@-uninstalled.pc champlain-gtk-@API_VERSION@-uninstalled.pc: champlain-gtk-uninstalled.pc @cp -f $< $@ endif @@ -22,7 +24,8 @@ pkgconfigdir = $(libdir)/pkgconfig DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc -CLEANFILES = $(pcfiles) +CLEANFILES = $(pcfiles) $(other_pcfiles) +all: $(other_pcfiles) # Have the demos build at the end as they depend on optional parts SUBDIRS += demos bindings -- 2.39.5