Implement source directory switching support (Closes: #530597).

[debhelper.git] / Debian / Debhelper / Buildsystem / makefile.pm

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 4f15152bd49fe0a31ff4f9100bc4f241397b81f5..4724440871ed4e93fc73371b7e0b7f844e4a25c2 100644 (file)
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -7,13 +7,14 @@
 package Debian::Debhelper::Buildsystem::makefile;
 
 use strict;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Lib qw(escape_shell);
 use base 'Debian::Debhelper::Buildsystem';
 
 sub get_makecmd_C {
        my $this=shift;
-       if ($this->get_builddir()) {
-               return $this->{makecmd} . " -C " . $this->get_builddir();
+       my $buildpath = $this->get_buildpath();
+       if ($buildpath ne '.') {
+               return $this->{makecmd} . " -C " . escape_shell($buildpath);
        }
        return $this->{makecmd};
 }
@@ -86,7 +87,7 @@ sub install {
 
 sub clean {
        my $this=shift;
-       if (!$this->clean_builddir()) {
+       if (!$this->rmdir_builddir()) {
                $this->make_first_existing_target(['distclean', 'realclean', 'clean'], @_);
        }
 }