diff --git a/menuselect/Makefile b/menuselect/Makefile
index cdd7ebedbe12be1dd8f4ad30bf120fca0ee29077..c2c9373f4f37ae50e9605e211e70d35c6493f99a 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 5945f5c9f69589c4d701045c44d4340df5e9530c..2dd4ed6521aa463ee46451dd9333cfca5d562bc9 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