diff options
| -rw-r--r-- | .Makefile.inc | 20 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 725fcab17..f2bd5a09c 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -24,12 +24,19 @@ MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODU all : @MAKEORDER@ mods: + @echo "Making modules..." ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ircd: + @echo "Making ircd..." ${MAKE} -C src DIRNAME="src" $(MAKEARGS) + @echo "*************************************" + @echo "* BUILD COMPLETE! *" + @echo "* To install InspIRCd, type: *" + @echo "* make install *" + @echo "*************************************" -bininst: +install: -install -v -m 0700 src/libIRCDaes.so $(LIBPATH) -install -v -m 0700 src/libIRCDasyncdns.so $(LIBPATH) -install -v -m 0700 src/libIRCDbase.so $(LIBPATH) @@ -55,17 +62,18 @@ bininst: -install -v -m 0700 src/libIRCDtimer.so $(LIBPATH) -install -v -m 0700 src/inspircd $(BINPATH) @-install -v -m 0700 inspircd $(BASE) 2>/dev/null + @-cp conf/inspircd.quotes.example $(CONPATH) + @-cp conf/inspircd.rules.example $(CONPATH) + @-cp docs/inspircd.conf.example $(CONPATH) ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst @echo "*************************************" - @echo "* BUILD COMPLETE! *" + @echo "* INSTALL COMPLETE! *" @echo "* It is safe to ignore any messages *" @echo "* related to copying of files. *" + @echo "* *" + @echo "* REMEMBER TO EDIT YOUR CONFIG FILE *" @echo "*************************************" -config: - @-cp conf/inspircd.quotes.example $(CONPATH) - @-cp conf/inspircd.rules.example $(CONPATH) - @-cp docs/inspircd.conf.example $(CONPATH) clean: @echo Cleaning... @rm -rvf src/*.so src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~ @@ -43,7 +43,7 @@ chomp($config{GCCVER} = `gcc -dumpversion | cut -c 1`); # Major GCC Ve chomp($config{GCC34} = `gcc -dumpversion | cut -c 3`); # Minor GCC Version chomp($config{OSNAME} = `/bin/uname`); # Operating System Name $config{CC} = "g++"; # C++ compiler -$config{MAKEORDER} = "ircd mods config bininst"; # build order +$config{MAKEORDER} = "ircd mods"; # build order $config{STATICLIBS} = ""; # library archive path $config{MAX_IDENT} = "12"; # max ident size $config{MAX_QUIT} = "255"; # max quit message size @@ -816,12 +816,12 @@ sub getosflags { $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{LDLIBS} = ""; $config{MAKEPROG} = "/usr/bin/make"; - $config{MAKEORDER} = "ircd mods config bininst"; + $config{MAKEORDER} = "ircd mods"; } elsif ($config{OSNAME} eq "CYG-STATIC") { $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{LDLIBS} = ""; $config{MAKEPROG} = "/usr/bin/make"; - $config{MAKEORDER} = "mods ircd config bininst"; + $config{MAKEORDER} = "mods ircd"; $config{STATICLIBS} = "modules/mods.a"; $config{STATIC_LINK} = "yes"; } |