diff options
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r-- | Debian/Debhelper/Buildsystem/cmake.pm | 3 | ||||
-rw-r--r-- | Debian/Debhelper/Buildsystem/perl_makemaker.pm | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index 3eddc74f..ee90c1f9 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -18,6 +18,9 @@ sub check_auto_buildable { my ($step)=@_; if (-e $this->get_sourcepath("CMakeLists.txt")) { my $ret = $this->SUPER::check_auto_buildable(@_); + # Existence of CMakeCache.txt indicates cmake has already + # been used by a prior build step, so should be used + # instead of the parent makefile class. $ret++ if ($ret && -e $this->get_buildpath("CMakeCache.txt")); return $ret > 0 ? $ret : 1; } diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm index 473a3a7e..b2500ab7 100644 --- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm +++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm @@ -23,12 +23,6 @@ sub check_auto_buildable { return 1; } else { - # This is backwards compatible (with << 7.3) until build, test and - # clean steps are not reimplemented in the backwards compatibility - # breaking way. However, this is absolutely necessary for - # enforce_in_source_building() to work in corner cases in build, - # test and clean steps as the next class (makefile) does not - # enforce it. return $this->SUPER::check_auto_buildable(@_); } } |