From 9c95d2ea547f3566f1bf8b67c08da57845325341 Mon Sep 17 00:00:00 2001
From: Modestas Vainius <modestas@vainius.eu>
Date: Mon, 8 Jun 2009 13:07:47 +0300
Subject: Use term "out of source" rather than "outside source".

* "out of source" or "out of source tree" seems to be more popular
  term to describe building in the builddir.
* Avoid using hyphens in both "out of source" and "in source" terms.
---
 Debian/Debhelper/Buildsystem.pm       | 12 ++++++------
 Debian/Debhelper/Buildsystem/cmake.pm |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index d546d20b..718ef733 100644
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -43,7 +43,7 @@ sub DEFAULT_BUILD_DIRECTORY {
 
 # Constructs a new build system object. Named parameters:
 # - builddir -     specifies build directory to use. If not specified,
-#                  in-source build will be performed. If undef or empty,
+#                  in source build will be performed. If undef or empty,
 #                  DEFAULT_BUILD_DIRECTORY will be used.
 # - build_step -   set this parameter to the name of the build step
 #                  if you want the object to determine its is_buidable
@@ -100,22 +100,22 @@ sub check_auto_buildable {
 }
 
 # Derived class can call this method in its constructor
-# to enforce in-source building even if the user requested otherwise.
+# to enforce in source building even if the user requested otherwise.
 sub enforce_in_source_building {
 	my $this=shift;
 	if ($this->{builddir}) {
 		# Do not emit warning unless the object is buildable.
 		if ($this->is_buildable()) {
 			warning("warning: " . $this->NAME() .
-			    " does not support building outside-source. In-source build enforced.");
+			    " does not support building out of source tree. In source building enforced.");
 		}
 		$this->{builddir} = undef;
 	}
 }
 
 # Derived class can call this method in its constructor to enforce
-# outside-source building even if the user didn't request it.
-sub enforce_outside_source_building {
+# out of source building even if the user didn't request it.
+sub enforce_out_of_source_building {
 	my ($this, $builddir) = @_;
 	if (!defined $this->{builddir}) {
 		$this->{builddir} = ($builddir && $builddir ne ".") ? $builddir : $this->DEFAULT_BUILD_DIRECTORY();
@@ -193,7 +193,7 @@ sub doit_in_builddir {
 	return 1;
 }
 
-# In case of outside-source tree building, whole build directory
+# In case of out of source tree building, whole build directory
 # gets wiped (if it exists) and 1 is returned. Otherwise, nothing
 # is done and 0 is returned.
 sub clean_builddir {
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index bb038727..d1fe6899 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -1,5 +1,5 @@
 # A buildsystem plugin for handling CMake based projects.
-# It enforces outside-source building.
+# It enforces out of source tree building.
 #
 # Copyright: © 2008-2009 Modestas Vainius
 # License: GPL-2+
@@ -25,8 +25,8 @@ sub check_auto_buildable {
 sub new {
 	my $class=shift;
 	my $this=$class->SUPER::new(@_);
-	# Enforce outside-source tree builds.
-	$this->enforce_outside_source_building();
+	# Enforce out of source tree building.
+	$this->enforce_out_of_source_building();
 	return $this;
 }
 
-- 
cgit v1.2.3