From 138929756fedf3114b001fe9d54e7c49e6656cbe Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 9 Jul 2002 10:45:37 +0000
Subject: merge from release branch

Original commit message from CVS:
merge from release branch
---
 Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 84b90b4e..89ca8708 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,14 +10,14 @@ else
 EXT_DIR=
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gstreamer-libs.pc
+
 SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) ## testsuite
 
 DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
 
 EXTRA_DIST=gst-plugins.spec depcomp \
-	AUTHORS COPYING README RELEASE LICENSE LICENSE_readme \
-	ChangeLog autogen.sh common m4
-
-dist-hook:
-	rm -rf `find $(distdir)/common -name CVS`
-	rm -rf `find $(distdir)/m4 -name CVS`
+           gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
+	   AUTHORS COPYING README RELEASE \
+	   ChangeLog autogen.sh
-- 
cgit