summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-03-23 00:54:40 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-03-23 00:54:40 +0100
commitaaae660fee19a56c752bdec84da86c4b1e779af0 (patch)
tree56ecaeab588acc4afdbdf1ec4b1c1acdc21364e7 /make
parente1e7ab0a18100d7e2cde0eb8d787f6ce1f958643 (diff)
parent214c6bc5254c94aa7f7ab49e3462728fb7be9d2a (diff)
Merge pull request #1005 from SaberUK/master+minor-tweaks
Various changes mainly relating to the build system.
Diffstat (limited to 'make')
-rw-r--r--make/configure.pm2
-rw-r--r--make/console.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/make/configure.pm b/make/configure.pm
index 2cd5beb60..84f076483 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -167,7 +167,7 @@ FLAGS
will search for c++, g++, clang++ or icpc.
If you have any problems with configuring InspIRCd then visit our IRC channel
-at irc.ChatSpike.net #InspIRCd.
+at irc.inspircd.org #InspIRCd for support.
EOH
exit 0;
diff --git a/make/console.pm b/make/console.pm
index 9be5ef47c..045df8a70 100644
--- a/make/console.pm
+++ b/make/console.pm
@@ -80,13 +80,13 @@ sub prompt_bool($$$) {
return $answer =~ /y/i;
}
-sub prompt_dir($$$) {
- my ($interactive, $question, $default) = @_;
+sub prompt_dir($$$;$) {
+ my ($interactive, $question, $default, $create_now) = @_;
my ($answer, $create);
do {
$answer = rel2abs(prompt_string($interactive, $question, $default));
$create = prompt_bool($interactive && !-d $answer, "$answer does not exist. Create it?", 'y');
- if ($create) {
+ if ($create && $create_now) {
my $mkpath = eval {
mkpath($answer, 0, 0750);
return 1;