Fix "make -jX debug install" causing linker errors.

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

diff --git a/make/template/main.mk b/make/template/main.mk
index 17e15f53af2f46420a4b22d3285c01818e92c005..fa2375ac139ba3ed34b3997e8b74cefbb4abc132 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -42,6 +42,7 @@ PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
+LOGPATH = "$(DESTDIR)@LOG_DIR@"
 DATPATH = "$(DESTDIR)@DATA_DIR@"
 BINPATH = "$(DESTDIR)@BINARY_DIR@"
 INSTALL = install
@@ -50,7 +51,7 @@ INSTMODE_DIR = 0755
 INSTMODE_BIN = 0755
 INSTMODE_LIB = 0644
 
-@IFEQ $(CC) icc
+@IFEQ $(CC) icpc
   CXXFLAGS += -Wshadow
 @ELSE
   CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
@@ -91,7 +92,7 @@ INSTMODE_LIB = 0644
 DBGOK=0
 @IFEQ $(D) 0
   CXXFLAGS += -O2
-@IFEQ $(CC) gcc
+@IFEQ $(CC) g++
     CXXFLAGS += -g1
 @ENDIF
   HEADER = std-header
@@ -125,6 +126,7 @@ CXXFLAGS += -Iinclude
   @BSD_ONLY MAKE += -s
   RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
   RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
+  VERBOSE =
 @ENDIF
 
 @IFDEF PURE_STATIC
@@ -219,8 +221,8 @@ install: target
                exit 1; \
        fi
        @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
-       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
-       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
+       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
@@ -281,8 +283,8 @@ configureclean:
        -rm -f org.inspircd.plist
 
 distclean: clean configureclean
-       rm -rf $(BASE)
-       find src/modules/ -type l | xargs rm -f
+       -rm -rf $(SOURCEPATH)/run
+       find $(SOURCEPATH)/src/modules -type l | xargs rm -f
 
 help:
        @echo 'InspIRCd Makefile'
@@ -308,9 +310,10 @@ help:
        @echo '           Multiple targets may be separated by a space'
        @echo ''
        @echo ' clean     Cleans object files produced by the compile'
-       @echo ' distclean Cleans all files produced by compile and ./configure'
-       @echo '           Note: this includes the Makefile'
+       @echo ' distclean Cleans all generated files (build, configure, run, etc)'
        @echo ' deinstall Removes the files created by "make install"'
        @echo
 
+.NOTPARALLEL:
+
 .PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean configureclean help