X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfigaction.cpp;h=d0209fa1e33d452d0817323b644c704c4c4fa0e7;hb=699493ee7346c578537f4e310702c57012686c22;hp=23684f653348c296705cd2b62c721c97640b8a68;hpb=7edb751727a176f58da886c2424d4840a0a910fd;p=builder.git

diff --git a/source/pkgconfigaction.cpp b/source/pkgconfigaction.cpp
index 23684f6..d0209fa 100644
--- a/source/pkgconfigaction.cpp
+++ b/source/pkgconfigaction.cpp
@@ -1,11 +1,10 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
@@ -19,11 +18,11 @@ using namespace Msp;
 PkgConfigAction::PkgConfigAction(Builder &b, const PkgConfig &p):
 	Action(b)
 {
-	const SourcePackage &spkg=*static_cast<const SourcePackage *>(p.get_package());
+	const SourcePackage &spkg = *static_cast<const SourcePackage *>(p.get_package());
 
-	announce(spkg.get_name(), "PC", relative(p.get_name(), spkg.get_source()).str());
+	announce(spkg.get_name(), "PC", basename(p.get_path()));
 
-	IO::BufferedFile out(p.get_name(), IO::M_WRITE);
+	IO::BufferedFile out(p.get_path().str(), IO::M_WRITE);
 	// Prefix is already included in the various paths
 	//IO::print(out, "prefix=%s\n", pkg.get_prefix());
 	IO::print(out, "source=%s\n\n", spkg.get_source());
@@ -33,13 +32,13 @@ PkgConfigAction::PkgConfigAction(Builder &b, const PkgConfig &p):
 	IO::print(out, "Version: %s\n", spkg.get_version());
 
 	IO::print(out, "Requires:");
-	const PackageList &reqs=spkg.get_requires();
+	const PackageList &reqs = spkg.get_requires();
 	for(PackageList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
 		if((*i)->get_use_pkgconfig())
 			IO::print(out, " %s", (*i)->get_name());
 	out.put('\n');
 
-	const BuildInfo &binfo=spkg.get_exported_binfo();
+	const BuildInfo &binfo = spkg.get_exported_binfo();
 	IO::print(out, "Libs:");
 	for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
 		IO::print(out, " -L%s", *i);