Mercurial > hg > dhcpcd

changeset 2499:0554844cb8a4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Load config.{h,mk} when building tests. Fixes [1c11c59282].
author Roy Marples <roy@marples.name>
date Fri, 30 May 2014 21:47:14 +0000
parents a08798c4143c
children 28b90a83ae19
files GNUmakefile iconfig.mk
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Thu May 29 12:52:27 2014 +0000
+++ b/GNUmakefile	Fri May 30 21:47:14 2014 +0000
@@ -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
--- a/iconfig.mk	Thu May 29 12:52:27 2014 +0000
+++ b/iconfig.mk	Fri May 30 21:47:14 2014 +0000
@@ -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
+TOP?=		.
+_CONFIG_MK!=	test -e ${TOP}/config.mk && \
+		    echo config.mk || echo config-null.mk
 CONFIG_MK?=	${_CONFIG_MK}
-TOP?=		.
 include		${TOP}/${CONFIG_MK}