Merge pull request #123 from SaberUK/fix-issue-14

[2.1] Install example configuration files into their own directory.
This commit is contained in:
Robin Burchell 2012-05-16 12:14:42 -07:00
commit 5f161583e8

View File

@ -244,7 +244,7 @@ install: target
@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) '$(BASE)'/data
@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) '$(BASE)'/logs
@-install -d -m $(INSTMODE_DIR) '$(BINPATH)'
@-install -d -m $(INSTMODE_DIR) '$(CONPATH)'
@-install -d -m $(INSTMODE_DIR) '$(CONPATH)/examples'
@-install -d -m $(INSTMODE_DIR) '$(MODPATH)'
[ '$(BUILDPATH)'/bin/ -ef '$(BINPATH)' ] || install -m $(INSTMODE_BIN) '$(BUILDPATH)'/bin/inspircd '$(BINPATH)'
@IFEQ $(PURE_STATIC) 0
@ -252,7 +252,7 @@ install: target
@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)'
-install -m $(INSTMODE_LIB) docs/*.example '$(CONPATH)/examples'
@echo ""
@echo "*************************************"
@echo "* INSTALL COMPLETE! *"
@ -263,7 +263,9 @@ install: target
@echo ' Binaries: $(BINPATH)'
@echo ' Modules: $(MODPATH)'
@echo 'To start the ircd, run: $(BASE)/inspircd start'
@echo 'Remember to edit your config file: $(CONPATH)/inspircd.conf'
@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
@echo 'Examples are available at:' $(CONPATH)/examples/
@GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
@BSD_ONLY RCS_FILES = src/version.sh