thomasvs - flumotion/branches/platform-3

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Tue May  8 15:06:12 2007
New Revision: 4890

Modified:
   flumotion/branches/platform-3/   (props changed)
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/env.in
Log:
Merged revisions 4807 via svnmerge from 
https://svn.fluendo.com/svn/flumotion/trunk

........
  r4807 | thomasvs | 2007-04-17 13:44:08 +0200 (Tue, 17 Apr 2007) | 4 lines
  
  	* env.in:
  	  Actually put the pkgconfig directory in.
........


Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue May  8 15:06:12 2007
@@ -1,5 +1,13 @@
 2007-05-08  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	merged from: trunk, 4807
+
+	* env.in:
+	  Actually put the pkgconfig directory in.
+
+
+2007-05-08  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	merged from: trunk, 4753,4768-4770
 
 	* common/trial.mk:

Modified: flumotion/branches/platform-3/env.in
==============================================================================
--- flumotion/branches/platform-3/env.in	(original)
+++ flumotion/branches/platform-3/env.in	Tue May  8 15:06:12 2007
@@ -4,7 +4,7 @@
 src_dir=`cd $build_dir && cd @top_srcdir@ && pwd`
 
 export PYTHONPATH=$src_dir${PYTHONPATH:+:$PYTHONPATH}
-export PKG_CONFIG_PATH=$src_dir${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+export PKG_CONFIG_PATH=$src_dir/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
 
 export PATH=$build_dir/bin:$PATH
 export PACKAGES="@PACKAGE at -@VERSION@ $PACKAGES"