diff options
| author | Corey Farrell <git@cfware.com> | 2017-12-27 20:27:18 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-12-27 20:17:15 -0600 |
| commit | 6338a03ce93fd56d4127e72d7835089441c759e4 (patch) | |
| tree | cbba3c79d557a46e4addd4382dc5c5e37c96217e | |
| parent | 23aa20bf209dbc02b01c757c5f5f1a787548ed96 (diff) | |
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
| -rw-r--r-- | menuselect/Makefile | 5 | ||||
| -rw-r--r-- | menuselect/configure.ac | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/menuselect/Makefile b/menuselect/Makefile index cdd7ebedb..c2c9373f4 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 5945f5c9f..2dd4ed652 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 |