git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH v2] Makefile: don't remove configure on distclean
Date: Tue, 5 Nov 2024 20:58:09 +0100	[thread overview]
Message-ID: <9b9ebfb7-9fe4-42fd-8dbc-2de85c5dbe16@maxsi.org> (raw)
In-Reply-To: <xmqqldxxsf4p.fsf@gitster.g>

make distclean conventionally restores the extracted release tarball to
its original distributed contents by cleaning the source code for
distribution. However, the configure script is part of the distribution
and should not be removed. This behavior is creating problems on my
package infrastructure where configure-based packages have make
distclean run afterwards and then the subsequent git build fails.

Add reallyclean for development that also removes configure.

Signed-off-by: Jonas 'Sortie' Termansen <sortie@maxsi.org>
---
Yeah -- I was thinking you'd want a reallyclean target or something,
but wasn't sure what to call it. Here's a version with reallyclean:

 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6f5986b66e..b8932e7c2b 100644
--- a/Makefile
+++ b/Makefile
@@ -3693,7 +3693,7 @@ artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \
 
 htmldocs = git-htmldocs-$(GIT_VERSION)
 manpages = git-manpages-$(GIT_VERSION)
-.PHONY: dist-doc distclean
+.PHONY: dist-doc distclean reallyclean
 dist-doc: git$X
 	$(RM) -r .doc-tmp-dir
 	mkdir .doc-tmp-dir
@@ -3723,11 +3723,13 @@ dist-doc: git$X
 ### Cleaning rules
 
 distclean: clean
-	$(RM) configure
 	$(RM) config.log config.status config.cache
 	$(RM) config.mak.autogen config.mak.append
 	$(RM) -r autom4te.cache
 
+reallyclean: distclean
+	$(RM) configure
+
 profile-clean:
 	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
 	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
-- 
2.45.2


      reply	other threads:[~2024-11-05 19:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-05 10:13 [PATCH] Makefile: don't remove configure on distclean Jonas 'Sortie' Termansen
2024-11-05 18:35 ` Junio C Hamano
2024-11-05 19:58   ` Jonas 'Sortie' Termansen [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9b9ebfb7-9fe4-42fd-8dbc-2de85c5dbe16@maxsi.org \
    --to=sortie@maxsi.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).