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

diff --git a/GNUmakefile b/GNUmakefile
index 549abe3a2a646e48eb67f8429df0116cfa57542b..e06fb447d3a414eb56ea3a908d9c767bf81c54cf 100644 (file)
--- 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 7db6009863d0c416cfc1c94b51d4466e31cbfd14..465e02eae0ad38ba95d6f26db21458768c4c5f87 100644 (file)
--- 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}