Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Improve the output of "make install"
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12660 e03df62e-2008-0410-955e-edbf42e46eb7
  • Loading branch information
danieldg committed Mar 24, 2010
1 parent fea69b0 commit 5a7d1bb
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions make/template/main.mk
Expand Up @@ -77,16 +77,16 @@ CXXFLAGS += -Iinclude
@BSD_ONLY SOURCEPATH != /bin/pwd

@IFDEF V
RUNCC = $(CC)
VERBOSE = -v
RUNCC = $(CC)
VERBOSE = -v
@ELSE
@GNU_ONLY MAKEFLAGS += --silent
@BSD_ONLY MAKE += -s
RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
@GNU_ONLY MAKEFLAGS += --silent
@BSD_ONLY MAKE += -s
RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
@ENDIF

@IFDEF PURE_STATIC
CXXFLAGS += -DPURE_STATIC
CXXFLAGS += -DPURE_STATIC
@ENDIF

@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS PURE_STATIC
Expand Down Expand Up @@ -165,20 +165,24 @@ install: target
@-install -d -m $(INSTMODE_DIR) $(BINPATH)
@-install -d -m $(INSTMODE_DIR) $(CONPATH)
@-install -d -m $(INSTMODE_DIR) $(MODPATH)
install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
install -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(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)
@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/*.example $(CONPATH)
@echo ""
@echo "*************************************"
@echo "* INSTALL COMPLETE! *"
@echo "* *"
@echo "* It is safe to ignore any messages *"
@echo "* related to copying of conf files. *"
@echo "* *"
@echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
@echo "*************************************"
@echo 'Paths:'
@echo ' Base install:' $(BASE)
@echo ' Configuration:' $(CONPATH)
@echo ' Binaries:' $(BINPATH)
@echo ' Moudles:' $(MODPATH)
@echo 'To start the ircd, run:' $(BASE)/inspircd start
@echo 'Remember to edit your config file:' $(CONPATH)/inspircd.conf

@GNU_ONLY RCS_FILES = $(wildcard .git/index .svn/entries src/version.sh)
@BSD_ONLY RCS_FILES = src/version.sh
Expand Down

0 comments on commit 5a7d1bb

Please sign in to comment.