diff options
| author | Robin Burchell <viroteck@viroteck.net> | 2012-05-15 03:57:35 -0700 |
|---|---|---|
| committer | Robin Burchell <viroteck@viroteck.net> | 2012-05-15 03:57:35 -0700 |
| commit | f26bacfd6d9f94986c04e9cde87af1a6c8149074 (patch) | |
| tree | d51dbfe25900ca90feac68faee37acd8bbc75d7e | |
| parent | 44f42a13de52c8025942ddab42f51feb36821782 (diff) | |
| parent | f4e2332421971bc540033e1c0b69392fd0f27a04 (diff) | |
Merge pull request #104 from SaberUK/fix-issue-14
[2.0] Install example configuration files into their own directory.
| -rw-r--r-- | make/template/main.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index eb551ba74..9a5f4db05 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -212,7 +212,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) @IFNDEF PURE_STATIC @@ -220,7 +220,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! *" @@ -231,7 +231,8 @@ 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 |