From aebbb15fe2d1ef900e7a66dc16bdf89f2a2394d6 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 20 Apr 2017 12:06:39 +0100
Subject: [PATCH] Turn on debug if $VERSION is master rather than commenting
 and uncommenting.

---
 Makefile.am  |  2 --
 SYNCING      | 24 ++++++++++--------------
 configure.ac |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index da0fcc39..e0eb143c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ CLEANFILES = tmux.1.mdoc tmux.1.man
 EXTRA_DIST = \
 	CHANGES FAQ README TODO COPYING example_tmux.conf compat/*.[ch] \
 	osdep-*.c mdoc2man.awk tmux.1
-dist-hook:
-	grep "^#enable_debug=" configure
 
 # Preprocessor flags.
 AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
diff --git a/SYNCING b/SYNCING
index 5d9b863d..a0d0404c 100644
--- a/SYNCING
+++ b/SYNCING
@@ -140,16 +140,12 @@ to compat/ as and when appropriate.
 Release tmux for next version
 =============================
 
-1. Comment the "enable_debug=yes" line in configure.ac, since releases
-   don't have debugging enabled, otherwise make(1) aborts when
-   preparing the distribution.
-
-2. Update and commit README and CHANGES.  The former should be checked for
+1. Update and commit README and CHANGES.  The former should be checked for
    anything outdated and updated with a list of things that might break
    upgrades and the latter should mention all the major changes since
    the last version.
 
-3. Tag with:
+2. Tag with:
 
    % git tag -a 2.X
 
@@ -157,20 +153,20 @@ Release tmux for next version
 
    Push the tag out with:
 
-   % git push 2.X
+   % git push --tags
 
-4. Build the tarball with 'make dist'.
+3. Build the tarball with 'make dist'.
 
-5. Check the tarball.  If it's good, go here to select the tag just pushed:
+4. Check the tarball.  If it's good, go here to select the tag just pushed:
 
    https://github.com/tmux/tmux/tags
 
    Click the "Add release notes", upload the tarball and add a link in the
    description field to the CHANGES file.
 
-7. Clone the tmux.github.io repository, and change the RELEASE version in
-   the Makefile.  Commit it, and run 'make' to replace %%VERSION%%.  Push
-   the result out.
+5. Clone the tmux.github.io repository, and change the RELEASE version in the
+   Makefile.  Commit it, and run 'make' to replace %%VERSION%%.  Push the
+   result out.
 
-8. Bump version in tmux/tmux.git configure.ac and uncomment "enable_debug=yes" to
-   create a debug build by default.
+6. Bump version in tmux/tmux.git configure.ac and uncomment "enable_debug=yes"
+   to create a debug build by default.
diff --git a/configure.ac b/configure.ac
index b078c4f4..31098d16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_USE_SYSTEM_EXTENSIONS
 test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
 
 # Is this --enable-debug?
-enable_debug=yes
+test "x$VERSION" = xmaster && enable_debug=yes
 AC_ARG_ENABLE(
 	debug,
 	AC_HELP_STRING(--enable-debug, enable debug build flags),