From d7a7f37d14fd4433309fd2d2fae26916a1b60aee Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 26 Jan 2022 13:23:46 +0000
Subject: Kill vendor_directory in favour of normal include paths.

---
 make/directive.pm | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'make')

diff --git a/make/directive.pm b/make/directive.pm
index 44b424487..cc61203b4 100644
--- a/make/directive.pm
+++ b/make/directive.pm
@@ -33,7 +33,6 @@ use make::console;
 
 use constant DIRECTIVE_ERROR_PIPE => $ENV{INSPIRCD_VERBOSE} ? '' : '2>/dev/null';
 use constant PKG_CONFIG           => $ENV{PKG_CONFIG} || 'pkg-config';
-use constant VENDOR_DIRECTORY     => catdir(dirname(dirname(__FILE__)), 'vendor');
 
 our @EXPORT = qw(
 	get_directives
@@ -317,26 +316,6 @@ sub __function_require_version {
 	return "";
 }
 
-sub __function_vendor_directory {
-	my ($file, $name) = @_;
-
-	# Try to look the directory up in the environment...
-	my $key = __environment 'INSPIRCD_VENDOR_', $name;
-	if (defined $ENV{$key}) {
-		say console_format "Found the <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>";
-		return $ENV{$key};
-	}
-
-	my $directory = catdir(VENDOR_DIRECTORY, $name);
-	if (-d $directory) {
-		say console_format "Using the default <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|>: <|BOLD $directory|>";
-		return $directory;
-	}
-
-	# We can't find it via the environment or via the filesystem so give up.
-	__error $file, "unable to find the <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|>!";
-}
-
 sub __function_warning {
 	my ($file, @messages) = @_;
 	print_warning @messages;
-- 
cgit v1.3.1-10-gc9f91