diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-01-31 14:33:53 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-01-31 14:38:46 +0000 |
| commit | 55a0a6ab66739fae65d123fadff1a31d96999c16 (patch) | |
| tree | ff9c4c9d0af8b47fd0ad5b078ef85d079f5d88ec | |
| parent | 10714b0ded0ff1304034bb3c2eab9ef5fb163616 (diff) | |
Fix the base path being used for more than just the install prefix.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | make/template/inspircd | 3 | ||||
| -rw-r--r-- | make/template/main.mk | 4 |
3 files changed, 1 insertions, 8 deletions
@@ -322,7 +322,6 @@ EOW my $question = <<"EOQ"; Currently, InspIRCd is configured with the following paths: -<|BOLD Base:|> $config{BASE_DIR} <|BOLD Binary:|> $config{BINARY_DIR} <|BOLD Config:|> $config{CONFIG_DIR} <|BOLD Data:|> $config{DATA_DIR} @@ -456,7 +455,6 @@ push @makeargs, "-j${\(get_cpu_count() + 1)}"; print console_format <<"EOM"; <|GREEN Paths:|> - <|GREEN Base:|> $config{BASE_DIR} <|GREEN Binary:|> $config{BINARY_DIR} <|GREEN Config:|> $config{CONFIG_DIR} <|GREEN Data:|> $config{DATA_DIR} diff --git a/make/template/inspircd b/make/template/inspircd index c50d28c7f..9bc7dd85f 100644 --- a/make/template/inspircd +++ b/make/template/inspircd @@ -62,11 +62,10 @@ use constant { }; my $scriptpath = "@SCRIPT_DIR@"; -my $basepath = "@BASE_DIR@"; my $confpath = "@CONFIG_DIR@"; my $binpath = "@BINARY_DIR@"; my $runtimedir = "@RUNTIME_DIR@"; -my $valgrindlogpath = "$basepath/valgrindlogs"; +my $valgrindlogpath = "@LOG_DIR@/valgrind"; my $executable = "inspircd"; my $version = "@VERSION_FULL@"; my $uid = "@UID@"; diff --git a/make/template/main.mk b/make/template/main.mk index 181c1f9f2..a8783aa05 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -51,7 +51,6 @@ CORELDFLAGS = -rdynamic -L. PICLDFLAGS = -fPIC -shared -rdynamic DESTDIR := $(if $(DESTDIR),$(DESTDIR),"@DESTDIR|@") -BASE = "$(DESTDIR)@BASE_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" @@ -212,7 +211,6 @@ finishmessage: target @echo "*************************************" install: target - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE) @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) @@ -252,7 +250,6 @@ endif @echo "* INSTALL COMPLETE! *" @echo "*************************************" @echo 'Paths:' - @echo ' Base install:' $(BASE) @echo ' Configuration:' $(CONPATH) @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) @@ -308,7 +305,6 @@ help: @echo 'Targets:' @echo ' all Complete build of InspIRCd, without installing (default)' @echo ' install Build and install InspIRCd to the directory chosen in ./configure' - @echo ' Currently installs to ${BASE}' @echo ' debug Compile a debug build. Equivalent to "make D=1 all"' @echo '' @echo ' INSPIRCD_TARGET=target Builds a user-specified target, such as "inspircd" or "core_dns"' |