Fix system-wide installation of the data and log directories.

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

diff --git a/make/template/main.mk b/make/template/main.mk
index 1c61547fdeb81d7f9fcdf55bbe92f405db029051..1dff0fc20201151a50c0f93f2b77bb519846c0bf 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -42,14 +42,16 @@ 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
 INSTUID = @UID@
 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
@@ -67,9 +69,11 @@ INSTMODE_LIB = 0644
 @ENDIF
 @IFEQ $(SYSTEM) solaris
   LDLIBS += -lsocket -lnsl -lrt -lresolv
+  INSTALL = ginstall
 @ENDIF
 @IFEQ $(SYSTEM) sunos
   LDLIBS += -lsocket -lnsl -lrt -lresolv
+       INSTALL = ginstall
 @ENDIF
 @IFEQ $(SYSTEM) darwin
   CXXFLAGS += -DDARWIN -frtti
@@ -87,7 +91,10 @@ INSTMODE_LIB = 0644
 
 DBGOK=0
 @IFEQ $(D) 0
-  CXXFLAGS += -O2 -g1
+  CXXFLAGS += -O2
+@IFEQ $(CC) g++
+    CXXFLAGS += -g1
+@ENDIF
   HEADER = std-header
   DBGOK=1
 @ENDIF
@@ -119,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
@@ -212,22 +220,22 @@ install: target
                echo ""; \
                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 -m $(INSTMODE_DIR) $(BINPATH)
-       @-install -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
-       @-install -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
-       @-install -d -m $(INSTMODE_DIR) $(MODPATH)
-       [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
+       @-$(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
+       @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+       [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
 @IFNDEF PURE_STATIC
-       [ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || install -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
+       [ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
 @ENDIF
-       -install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
-       -install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
-       -install -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
-       -install -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
-       -install -m $(INSTMODE_LIB) docs/conf/modules/*.conf.* $(CONPATH)/examples/modules
+       -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+       -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
        @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"
@@ -275,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'
@@ -302,8 +310,7 @@ 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