Move the SQL tables to docs/sql and install them on `make install`.

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

diff --git a/make/template/main.mk b/make/template/main.mk
index 07708428024d508552c86b7dc405ce4f94386e7d..a67c14f732c7dc25334cfb7eeccd9cf6f780d7ce 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -36,8 +36,8 @@ BUILDPATH ?= $(PWD)/build
 SOCKETENGINE = @SOCKETENGINE@
 CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow
 LDLIBS = -lstdc++
-CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
+CORELDFLAGS = -rdynamic -L.
+PICLDFLAGS = -fPIC -shared -rdynamic
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
 MANPATH = "$(DESTDIR)@MANUAL_DIR@"
@@ -78,8 +78,13 @@ ifeq ($(SYSTEM), solaris)
 endif
 ifeq ($(SYSTEM), darwin)
   LDLIBS += -ldl
-  CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
-  PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+  CORELDFLAGS = -dynamic -bind_at_load -L.
+  PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup
+endif
+ifeq ($(SYSTEM), haiku)
+  LDLIBS = -lnetwork -lstdc++
+  CORELDFLAGS = -L.
+  PICLDFLAGS = -fPIC -shared
 endif
 
 ifndef INSPIRCD_DEBUG
@@ -109,25 +114,22 @@ FOOTER = finishmessage
 
 MAKEFLAGS += --no-print-directory
 
-SOURCEPATH = $(shell /bin/pwd)
+SOURCEPATH = $(shell pwd)
 
 ifndef INSPIRCD_VERBOSE
   MAKEFLAGS += --silent
 endif
 
-ifdef INSPIRCD_STATIC
-  CORECXXFLAGS += -DINSPIRCD_STATIC
-endif
-
-# Add the users CPPFLAGS/CXXFLAGS to the base ones to allow them to
-# override things like -Wfatal-errors if they wish to.
+# Append any flags set in the environment after the base flags so
+# that they can be overridden if necessary.
 CORECXXFLAGS += $(CPPFLAGS) $(CXXFLAGS)
+CORELDFLAGS += $(LDFLAGS)
+PICLDFLAGS += $(LDFLAGS)
 
 export BUILDPATH
 export CORECXXFLAGS
 export CORELDFLAGS
 export CXX
-export INSPIRCD_STATIC
 export INSPIRCD_VERBOSE
 export LDLIBS
 export PICLDFLAGS
@@ -171,10 +173,6 @@ debug-header:
        @echo "*************************************"
 
 mod-header:
-ifdef INSPIRCD_STATIC
-       @echo 'Cannot build specific targets in pure-static build'
-       @exit 1
-endif
        @echo 'Building specific targets:'
 
 mod-footer: target
@@ -188,7 +186,7 @@ std-header:
        @echo "*   This will take a *long* time.   *"
        @echo "*     Why not read our wiki at      *"
        @echo "*     http://wiki.inspircd.org      *"
-       @echo "*  while you wait for make to run?  *"
+       @echo "*  while you wait for Make to run?  *"
        @echo "*************************************"
 
 finishmessage: target
@@ -197,7 +195,7 @@ finishmessage: target
        @echo "*        BUILD COMPLETE!            *"
        @echo "*                                   *"
        @echo "*   To install InspIRCd, type:      *"
-       @echo "*         make install              *"
+       @echo "*        'make install'             *"
        @echo "*************************************"
 
 install: target
@@ -216,13 +214,12 @@ install: target
        @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
+       @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
        @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH)
        [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
-ifndef INSPIRCD_STATIC
        [ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH)
-endif
        -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
        -$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
 ifeq ($(SYSTEM), darwin)
@@ -236,6 +233,7 @@ endif
        -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
        -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
        -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/services/*.example $(CONPATH)/examples/services
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/sql/*.sql $(CONPATH)/examples/sql
        -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null
        @echo ""
        @echo "*************************************"