Make the name of a FileTarget be its basename instead of full path

[builder.git] / source / pkgconfigaction.cpp

diff --git a/source/pkgconfigaction.cpp b/source/pkgconfigaction.cpp
index ddc6742c31b80a5538617b482a1eac4b442480dc..d0209fa1e33d452d0817323b644c704c4c4fa0e7 100644 (file)
--- a/source/pkgconfigaction.cpp
+++ b/source/pkgconfigaction.cpp
@@ -5,7 +5,6 @@ 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);