diff options
| author | Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> | 2008-08-14 20:16:59 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2008-08-14 20:16:59 +0000 |
| commit | c4645ac19ddb5f632790fb4559f25e0b0c18583d (patch) | |
| tree | 2c2507e2cabc0c4d3f92982f5a9feaa8b665fd9d /gobject/valaccodecompiler.vala | |
| parent | ece8b68df85535b821647dc4a2ede50dc11cc58f (diff) | |
| download | vala-c4645ac19ddb5f632790fb4559f25e0b0c18583d.tar.gz | |
compiler/valacompiler.vala
2008-08-14 Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
* gobject/valaccodecompiler.vala:
* compiler/valacompiler.vala
Prevent output filename concatenation when -d is passed with an
absolute path to -o, fixes bug 547344
svn path=/trunk/; revision=1752
Diffstat (limited to 'gobject/valaccodecompiler.vala')
| -rw-r--r-- | gobject/valaccodecompiler.vala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gobject/valaccodecompiler.vala b/gobject/valaccodecompiler.vala index 70f9664a8..ad7438a08 100644 --- a/gobject/valaccodecompiler.vala +++ b/gobject/valaccodecompiler.vala @@ -88,8 +88,8 @@ public class Vala.CCodeCompiler : Object { cmdline += " -c"; } else if (context.output != null) { string output = context.output; - if (context.directory != null && context.directory != "") { - output = "%s/%s".printf (context.directory, context.output); + if (context.directory != null && context.directory != "" && !Path.is_absolute (context.output)) { + output = "%s%c%s".printf (context.directory, Path.DIR_SEPARATOR, context.output); } cmdline += " -o " + Shell.quote (output); } |