diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-12-18 23:33:20 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-12-18 23:33:20 +0100 |
| commit | 8f13eddcd3f23a2c47e88e176f2e5032f8227450 (patch) | |
| tree | 6d1502231666f4471a44e44c29c6e899812899b7 | |
| parent | b0676698152d88c76020b0fa51942d7297f152f3 (diff) | |
| parent | bdaccea9600285febd1fabc3dddb6dbec9947f42 (diff) | |
Merge pull request #953 from SaberUK/master+configure-oversights
Fix some oversights from #895.
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | make/template/main.mk | 9 |
2 files changed, 13 insertions, 11 deletions
@@ -300,7 +300,7 @@ if (<src/modules/m_ssl_*.cpp> && prompt_bool $interactive, 'Would you like to ge system './tools/genssl', 'auto'; } -write_configure_cache %config if $interactive; +write_configure_cache %config; parse_templates \%config, \%compiler, \%version; print_format <<"EOM"; @@ -312,10 +312,15 @@ Configuration is complete! You have chosen to build with the following settings: <|GREEN Name:|> $compiler{NAME} <|GREEN Version:|> $compiler{VERSION} -<|GREEN Extra Modules:|> <<TODO>> - * m_foo - * m_bar - * m_baz +<|GREEN Extra Modules:|> +EOM + +for my $file (<src/modules/m_*>) { + my $module = basename $file, '.cpp'; + print " * $module\n" if -l $file; +} + +print_format <<"EOM"; <|GREEN Paths:|> <|GREEN Base:|> $config{BASE_DIR} diff --git a/make/template/main.mk b/make/template/main.mk index b4d77e4e6..521888bea 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -247,7 +247,7 @@ install: target -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples - -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) + -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules @echo "" @@ -264,11 +264,8 @@ install: target @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ -@TARGET BSD_MAKE CONFIGURE_CACHE_FILE = @CONFIGURE_CACHE_FILE@ -@TARGET GNU_MAKE CONFIGURE_CACHE_FILE = $(wildcard @CONFIGURE_CACHE_FILE@) - -GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure $(CONFIGURE_CACHE_FILE) - ./configure -update +GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ + ./configure --update @TARGET BSD_MAKE .MAKEFILEDEPS: BSDmakefile clean: |