diff --git a/Makefile b/Makefile index e52f62bb..43845cf0 100644 --- a/Makefile +++ b/Makefile @@ -7,18 +7,6 @@ HERE_REL := $(notdir $(CURDIR)) include Makefile.conf -ifneq ($(wildcard local.conf),) - $(info ================================================) - $(info Overrides in `local.conf` are used.) - $(info ================================================) -endif - -ifdef BUILD_CONFIG - $(info ================================================) - $(info Overrides in `$(BUILD_CONFIG)` are used.) - $(info ================================================) -endif - BUILT_IN_MIME= ifdef PEP_MIME diff --git a/Makefile.conf b/Makefile.conf index 0d6372cf..b5b838e0 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -436,18 +436,27 @@ dump-make-variables: ######### Banner ######### +ifneq ($(wildcard local.conf),) + LOCALCONFEXISTINGMESSAGE = local.conf +endif + +ifdef BUILD_CONFIG + BUILD_CONFIGMESSAGE := BUILD_CONFIG used ($(BUILD_CONFIG)) +endif + export BANNERPRINTED ifndef BANNERPRINTED BANNERPRINTED := yes VERSION=$(shell cat $(HERE)src/pEpEngine_version.h | grep 'PEP_ENGINE_VERSION "' | awk '{print $$3}' | tr '"' ' ') $(info ================================================) $(info Building p≡p Engine $(VERSION)) - $(info * safety mode '$(DEBUG)') - $(info * maximum log level '$(MAXLOGLEVEL)') - $(info * log desinations '$(LOGDESTINATIONS)') - $(info *) - $(info * CFLAGS: $(CFLAGS)) - $(info * CXXFLAGS: $(CXXFLAGS)) - $(info * CPPFLAGS: $(CPPFLAGS)) + $(info Safety mode '$(DEBUG)') + $(info Maximum log level '$(MAXLOGLEVEL)') + $(info Log desinations '$(LOGDESTINATIONS)') + $(info ) + $(info CFLAGS: $(CFLAGS)) + $(info CXXFLAGS: $(CXXFLAGS)) + $(info CPPFLAGS: $(CPPFLAGS)) + $(info Overrides: $(LOCALCONFEXISTINGMESSAGE) $(BUILD_CONFIGMESSAGE)) $(info ================================================) endif