From 0bdddbe5266d197e5b2d149888673cf898d5ce7a Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Wed, 27 Dec 2017 20:27:18 -0500 Subject: [PATCH] menuselect: Fix check for running configure. menuselect/Makefile checks that autoconfig.h and makeopts were newer than the '.in' files. Unfortunately running ./configure does not touch autoconfig.h unless the contents will change. Instead of looking at autoconfig.h we just need to ensure that makeopts is newer than configure. Also make change to configure.ac so bootstrap.sh doesn't re-add the extra trailing line-feed. Change-Id: Ief1f831d6717007f9cebb668c14e92782cd2b794 --- menuselect/Makefile | 5 +---- menuselect/configure.ac | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/menuselect/Makefile b/menuselect/Makefile index cdd7ebedbe..c2c9373f4f 100644 --- a/menuselect/Makefile +++ b/menuselect/Makefile @@ -64,10 +64,7 @@ all: $(ALL_TGTS) $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h -makeopts: makeopts.in -autoconfig.h: autoconfig.h.in - -makeopts autoconfig.h: +makeopts: configure @./configure $(CONFIGURE_SILENT) @echo "****" @echo "**** The configure script was just executed, so 'make' needs to be" diff --git a/menuselect/configure.ac b/menuselect/configure.ac index 5945f5c9f6..2dd4ed6521 100644 --- a/menuselect/configure.ac +++ b/menuselect/configure.ac @@ -61,9 +61,7 @@ AH_TOP( #endif ) -AH_BOTTOM( -#endif -) +AH_BOTTOM([#endif]) # Checks for programs. AC_PROG_CC