Fix the compiler_info name for the Intel compiler.

[user/henk/code/inspircd.git] / make / template / main.mk

diff --git a/make/template/main.mk b/make/template/main.mk
index 181c1f9f2c5f284cb794676e5beebf4da5cf5831..319d39c08f24fb92d9ae7a0f073d61f6af4dd8c6 100644 (file)
--- 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@"
@@ -59,6 +58,7 @@ EXAPATH = "$(DESTDIR)@EXAMPLE_DIR@"
 LOGPATH = "$(DESTDIR)@LOG_DIR@"
 MANPATH = "$(DESTDIR)@MANUAL_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
+RUNPATH = "$(DESTDIR)@RUNTIME_DIR@"
 SCRPATH = "$(DESTDIR)@SCRIPT_DIR@"
 
 INSTALL ?= install
@@ -67,7 +67,7 @@ INSTMODE_BIN ?= 0755
 INSTMODE_TXT ?= 0644
 INSTMODE_PRV ?= 0640
 
-ifneq ($(COMPILER), ICC)
+ifneq ($(COMPILER), Intel)
   CORECXXFLAGS += -Woverloaded-virtual -Wshadow
 ifneq ($(SYSTEM), openbsd)
     CORECXXFLAGS += -pedantic -Wformat=2 -Wmissing-format-attribute -Wno-format-nonliteral
@@ -212,7 +212,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)
@@ -223,6 +222,7 @@ install: target
        @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
        @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
        @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+       @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(RUNPATH)
        @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
        -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
        -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
@@ -252,7 +252,6 @@ endif
        @echo "*        INSTALL COMPLETE!          *"
        @echo "*************************************"
        @echo 'Paths:'
-       @echo '  Base install:' $(BASE)
        @echo '  Configuration:' $(CONPATH)
        @echo '  Binaries:' $(BINPATH)
        @echo '  Modules:' $(MODPATH)
@@ -308,7 +307,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"'