diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/calcdep.pl | 9 | ||||
| -rw-r--r-- | make/configure.pm | 1 | ||||
| -rw-r--r-- | make/template/main.mk | 9 |
3 files changed, 7 insertions, 12 deletions
diff --git a/make/calcdep.pl b/make/calcdep.pl index b0c6941b7..376d19573 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -239,15 +239,8 @@ sub dep_cpp($$$) { sub dep_so($) { my($file) = @_; my $out = find_output $file; - my $split = find_output $file, 1; - if ($ENV{SPLIT_CC}) { - dep_cpp $file, $split, 'gen-o'; - print MAKE "$out: $split\n"; - print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-so\$(VERBOSE) \$\@ \$(SOURCEPATH)/src/$file \$>\n"; - } else { - dep_cpp $file, $out, 'gen-so'; - } + dep_cpp $file, $out, 'gen-so'; return $out; } diff --git a/make/configure.pm b/make/configure.pm index 286424080..de95e9161 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -131,7 +131,6 @@ sub cmd_update { print "Updating...\n"; %main::config = read_configure_cache(); %main::cxx = get_compiler_info($main::config{CXX}); - $main::topdir = getcwd(); main::writefiles(); print "Update complete!\n"; exit 0; 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 |