configure, Makefile: Fail in Makefile if Config is not complete

Define CONFIG_OK in the Config file generated in the configure script
and check for it being defined in the Makefile before attempting
anything else. This way we can better inform the user that she needs to
run ./configure first.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

2 files changed, 6 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 9ad9db5..930c684 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@
 # Copyright 2012 - 2013 Daniel Borkmann <borkmann@gnumaniacs.org>
 # Subject to the GNU GPL, version 2.
 
-include Config
+-include Config
+ifndef CONFIG_OK
+  $(error "Please run `./configure' before `make'")
+endif
 
 VERSION = 0
 PATCHLEVEL = 5
diff --git a/configure b/configure
index 94cc924..61a6ba0 100755
--- a/configure
+++ b/configure
@@ -246,4 +246,6 @@ if [ "$MISSING_NACL" == "1" ] ; then
 	exit 1
 fi
 
+echo "CONFIG_OK=1" >> Config
+
 exit 0