git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <ebb9@byu.net>
To: git@vger.kernel.org
Cc: Eric Blake <ebb9@byu.net>
Subject: [PATCH 1/2] Makefile: installing git in cygwin 1.7.0
Date: Tue, 28 Apr 2009 06:28:31 -0600	[thread overview]
Message-ID: <1240921712-3100-2-git-send-email-ebb9@byu.net> (raw)
In-Reply-To: <1240921712-3100-1-git-send-email-ebb9@byu.net>

On platforms with $X, make removes any leftover scripts 'a' from
earlier builds if a new binary 'a.exe' is now built.  However, on
cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.
Test for file equality before attempting a remove, in order to avoid
nuking just-built binaries.

This repeats commit 0d768f7 for the installation destdir.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

This should be a trivial approval, seeing as how it finishes the
job of a previous patch (but this time for the installation dir,
as opposed to the build dir).  Without it, programs like git-var
get nuked during 'make install', giving a broken installation.

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 5c8e83a..93ca0db 100644
--- a/Makefile
+++ b/Makefile
@@ -1545,7 +1545,7 @@ ifndef NO_TCLTK
 	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
 endif
 ifneq (,$X)
-	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
+	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
 endif
 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
-- 
1.6.3.rc3.2.g4b51

  reply	other threads:[~2009-04-28 12:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-28 12:28 [PATCH 0/2] fix some make issues Eric Blake
2009-04-28 12:28 ` Eric Blake [this message]
2009-04-28 12:28   ` [PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA Eric Blake
2009-04-28 20:09     ` Junio C Hamano

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=1240921712-3100-2-git-send-email-ebb9@byu.net \
    --to=ebb9@byu.net \
    --cc=git@vger.kernel.org \
    /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).