(YACC): Remove, not used.

(MAINT): Don't set.
(${srcdir}/configure, $(srcdir)/src/stamp-h.in): Use @MAINT@ to
disable dependency on ${srcdir}/configure.in when maintainer mode
is disabled.

diff --git a/Makefile.in b/Makefile.in
index b16a85714166ebe88a0f3337a85b4ba799ae1d71..3549350b3e7431e16fa06703eba4ce582b077dac 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,7 +68,6 @@ LDFLAGS=@LDFLAGS@
 CPPFLAGS=@CPPFLAGS@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
-YACC=@YACC@
 EXEEXT=@EXEEXT@
 
 ### These help us choose version- and architecture-specific directories
@@ -236,9 +235,6 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-# Set to FRC to force running autoconf and autoheader
-MAINT =
-
 all: ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@@ -291,12 +287,12 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: ${srcdir}/configure
        ./config.status --recheck
 
-${srcdir}/configure: $(MAINT)
+${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
        cd ${srcdir} && autoconf
 
 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
        @true
-$(srcdir)/src/stamp-h.in: $(MAINT)
+$(srcdir)/src/stamp-h.in: @MAINT@ ${srcdir}/configure.in
        cd ${srcdir} && autoheader
        rm -f $(srcdir)/src/stamp-h.in
        echo timestamp > $(srcdir)/src/stamp-h.in