summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-06-01 11:26:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-06-01 11:26:21 -0700
commit501390c597d59696e25b5c35142f6da9ce83fdf3 (patch)
tree22e54bb2ff44e05bf480cbd67dfd0a6e22e334f7 /Makefile.in
parentbd56924f27bc0d56a21664fdb8a954e97842a270 (diff)
downloademacs-501390c597d59696e25b5c35142f6da9ce83fdf3.tar.gz
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
It is confusingly named and rarely useful. See, for example, <http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>. * INSTALL.BZR: Don't mention --disable-maintainer-mode. * Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed. * configure.in: Remove --disable-maintainer-mode. (USE_MAINTAINER_MODE, MAINT): Remove. * admin/make-tarball.txt: Don't worry about maintainer mode. * etc/NEWS: Mention this.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 699c4794d92..fb2530d13df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,10 +66,8 @@ CDPATH=
# ==================== Things `configure' Might Edit ====================
-MAINTAINER_MODE_FLAG = --disable-maintainer-mode
-@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
cache_file = @cache_file@
-CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
+CONFIGURE_FLAGS = --cache-file=$(cache_file)
CC=@CC@
CFLAGS=@CFLAGS@
@@ -360,16 +358,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
./configure $(CONFIGURE_FLAGS); \
fi
-AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
+AUTOCONF_INPUTS = $(srcdir)/configure.in $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
+ACLOCAL_INPUTS = $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
cd $(srcdir) && aclocal -I m4
-AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am $(srcdir)/lib/gnulib.mk
+AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
+ $(srcdir)/lib/gnulib.mk
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile
am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in