diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-02-26 20:19:58 +0000 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-04-11 15:38:17 +0200 |
| commit | 2803ae5d75e610fb821b7fdb3771777d62ac9fd3 (patch) | |
| tree | 955a1f5b6547a4e9366c113e118d0b5d980e3cb4 /make/template | |
| parent | 557c02839bec991dd846a6dc12ce7ba52de1525c (diff) | |
Remove various broken/useless features from the build system.
- Removed support for changing the build directory using configure.
This can still be set using make BUILDPATH=foo.
- Removed support for SPLIT_CC builds. This is not documented
anywhere and is quite useless as it doesn't work.
- Remove STARTSCRIPT from configure; always install the perl
helper.
Diffstat (limited to 'make/template')
| -rw-r--r-- | make/template/main.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 97e426e0e..e0018d728 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -33,7 +33,7 @@ CXX = @CXX@ COMPILER = @COMPILER@ SYSTEM = @SYSTEM@ -BUILDPATH = @BUILD_DIR@ +BUILDPATH ?= $(PWD)/build SOCKETENGINE = @SOCKETENGINE@ CORECXXFLAGS = -fPIC -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow LDLIBS = -lstdc++ @@ -131,7 +131,7 @@ FOOTER = finishmessage CORECXXFLAGS += $(CXXFLAGS) @DO_EXPORT RUNCC RUNLD CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS -@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC +@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC # Default target TARGET = all @@ -228,7 +228,10 @@ install: target @IFNDEF PURE_STATIC [ $(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_BIN) inspircd $(BASE) 2>/dev/null +@IFEQ $(SYSTEM) darwin + -$(INSTALL) -m $(INSTMODE_BIN) org.inspircd.plist $(BASE) 2>/dev/null +@ENDIF -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples |