From: Roy Marples <roy@marples.name>
Date: Fri, 30 May 2014 21:47:14 +0000 (+0000)
Subject: Load config.{h,mk} when building tests. Fixes [1c11c59282].
X-Git-Tag: v6.4.0~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55e83eba2de92dfdc2a2e2c8d56f581260480c80;p=thirdparty%2Fdhcpcd.git

Load config.{h,mk} when building tests. Fixes [1c11c59282].
---

diff --git a/GNUmakefile b/GNUmakefile
index 549abe3a..e06fb447 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,7 +2,9 @@
 # Luckily it does read GNUmakefile over Makefile so we can work around it
 
 # Nasty hack so that make clean works without configure being run
-CONFIG_MK?=$(shell test -e config.mk && echo config.mk || echo config-null.mk)
+TOP?=		.
+CONFIG_MK?=	$(shell test -e ${TOP}/config.mk && \
+		    echo config.mk || echo config-null.mk)
 
 include Makefile
 -include .depend
diff --git a/iconfig.mk b/iconfig.mk
index 7db60098..465e02ea 100644
--- a/iconfig.mk
+++ b/iconfig.mk
@@ -1,6 +1,7 @@
 # Nasty hack so that make clean works without configure being run
 # Requires gmake4
-_CONFIG_MK!=	test -e ${TOP}/config.mk && echo config.mk || echo config-null.mk
-CONFIG_MK?=	${_CONFIG_MK}
 TOP?=		.
+_CONFIG_MK!=	test -e ${TOP}/config.mk && \
+		    echo config.mk || echo config-null.mk
+CONFIG_MK?=	${_CONFIG_MK}
 include		${TOP}/${CONFIG_MK}