Make Makefile ready for local.conf, add deprecation warning to doc ENGINE-261
authorDamiano Boppart <damiano@pep-security.net>
Wed, 20 Sep 2017 18:20:45 +0200
branchENGINE-261
changeset 2082253f13cdf056
parent 2081 1593ebbb7f31
child 2084 c0f658b0289f
Make Makefile ready for local.conf, add deprecation warning to doc
.hgignore
Makefile
doc/build-debian.md
doc/build-macos.md
     1.1 --- a/.hgignore	Wed Sep 20 17:53:25 2017 +0200
     1.2 +++ b/.hgignore	Wed Sep 20 18:20:45 2017 +0200
     1.3 @@ -4,6 +4,7 @@
     1.4  ^asn\.1/libasn1\.a$
     1.5  .*xcuserdata/
     1.6  ^build/
     1.7 +^local.conf
     1.8  
     1.9  syntax: glob
    1.10  *.orig
     2.1 --- a/Makefile	Wed Sep 20 17:53:25 2017 +0200
     2.2 +++ b/Makefile	Wed Sep 20 18:20:45 2017 +0200
     2.3 @@ -11,7 +11,7 @@
     2.4  export YML_PATH=$(YML2_PATH)
     2.5  
     2.6  .PHONY: all
     2.7 -all: _platform_override_info
     2.8 +all: _override_info
     2.9  	$(MAKE) -C asn.1 generate
    2.10  	$(MAKE) -C asn.1
    2.11  	$(MAKE) -C sync
    2.12 @@ -52,12 +52,12 @@
    2.13  db:
    2.14  	$(MAKE) -C db db
    2.15  
    2.16 -.PHONY: _platform_override
    2.17 -ifdef PLATFORM_OVERRIDE
    2.18 -_platform_override_info:
    2.19 -	@echo "================================================"
    2.20 -	@echo "PLATFORM_OVERRIDE is set to '$(PLATFORM_OVERRIDE)'."
    2.21 -	@echo "================================================"
    2.22 +.PHONY: _override_info
    2.23 +ifneq ($(wildcard local.conf),)
    2.24 +_override_info:
    2.25 +	@echo "=============================="
    2.26 +	@echo "`local.conf` found, and in use"
    2.27 +	@echo "=============================="
    2.28  else
    2.29 -_platform_override_info:
    2.30 +_override_info:
    2.31  endif
     3.1 --- a/doc/build-debian.md	Wed Sep 20 17:53:25 2017 +0200
     3.2 +++ b/doc/build-debian.md	Wed Sep 20 18:20:45 2017 +0200
     3.3 @@ -64,6 +64,8 @@
     3.4  mkdir ~/code/pep-engine/build
     3.5  ~~~
     3.6  
     3.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     3.8 +
     3.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    3.10  In this guide, the platform-specific configuration will be called `local`.
    3.11  The installation directory will be a subdirectory of the repository.
     4.1 --- a/doc/build-macos.md	Wed Sep 20 17:53:25 2017 +0200
     4.2 +++ b/doc/build-macos.md	Wed Sep 20 18:20:45 2017 +0200
     4.3 @@ -76,6 +76,8 @@
     4.4  mkdir ~/code/pep-engine/build
     4.5  ~~~
     4.6  
     4.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     4.8 +
     4.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    4.10  In this guide, the platform-specific configuration will be called `local`.
    4.11  The installation directory will be a subdirectory of the repository.