diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-10-01 19:52:26 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2014-12-07 22:36:42 +0000 |
| commit | 133b110534ec3386d8735020e8679236002b6ed1 (patch) | |
| tree | d4850417eb23a175e68a20ab70b5b9912a242e44 /make/template | |
| parent | 500a0524d94d596b327ed9aaa17fd0a8ce9ebf96 (diff) | |
Improve configure cache file handling.
- Add a version number to the configure cache file.
- Disable configure cache file in non-interactive mode.
- Rename configure cache file to .configure.cache to avoid 2.0 files.
- Use run_test to produce the "reading .configure.cache" message.
Diffstat (limited to 'make/template')
| -rw-r--r-- | make/template/main.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index c78d9047d..b4a0d6f1c 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -261,7 +261,10 @@ install: target @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ -GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure .config.cache +@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 @TARGET BSD_MAKE .MAKEFILEDEPS: BSDmakefile @@ -284,7 +287,6 @@ deinstall: -rm -f $(BASE)/org.inspircd.plist configureclean: - rm -f .config.cache rm -f BSDmakefile rm -f GNUmakefile rm -f include/config.h @@ -293,6 +295,7 @@ configureclean: rm -f inspircd-genssl.1 -rm -f inspircd.service -rm -f org.inspircd.plist + -rm -f @CONFIGURE_CACHE_FILE@ distclean: clean configureclean -rm -rf $(SOURCEPATH)/run |