Replaces the convoluted attempts at detecting whether config.make was found in Makeconf by a simple definition in config.make itself.
Signed-off-by: Jeremie Koenig <j...@jk.fr.eu.org> --- Makeconf | 8 ++------ config.make.in | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makeconf b/Makeconf index 1a333ac..5e405ca 100644 --- a/Makeconf +++ b/Makeconf @@ -58,12 +58,8 @@ srcdir ?= $(builddir) top_srcdir ?= $(top_builddir) # Include the configure-generated file of parameters. -# This sets up variables for build tools and installation directories. -ifneq (,$(wildcard $(..)config.make)) -include $(..)config.make -# Set a flag for the makefiles to indicated config.make was included. -configured = yes -endif +configured = +-include $(top_builddir)/config.make # Complement the configured values. CFLAGS := -std=gnu99 $(gnu89-inline-CFLAGS) $(CFLAGS) $($*-CFLAGS) diff --git a/config.make.in b/config.make.in index 7876d47..4f9e346 100644 --- a/config.make.in +++ b/config.make.in @@ -1,5 +1,8 @@ # @configure_input@ +# Signal to Makeconf that this file was found. +configured = yes + # Machine architecture. machine = @host_cpu@ asm_syntax = @asm_syntax@ -- 1.7.1
