From: Stepan Kasal <kasal@ucw.cz>
To: Erik Faye-Lund <kusmabite@gmail.com>
Cc: GIT Mailing-list <git@vger.kernel.org>,
Pat Thoyts <patthoyts@users.sourceforge.net>,
msysGit <msysgit@googlegroups.com>
Subject: [PATCH 2/2] wincred: avoid overwriting configured variables
Date: Tue, 13 May 2014 08:53:35 +0200 [thread overview]
Message-ID: <20140513065335.GA28417@camelia.ucw.cz> (raw)
In-Reply-To: <CABPQNSYU5haMzdy2cDn=KF2+j_aFK19Ju+x+LTeex6JqWJMncQ@mail.gmail.com>
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Wed, 24 Oct 2012 00:15:29 +0100
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
---
Hi kusma,
On Tue, May 13, 2014 at 08:34:36AM +0200, Erik Faye-Lund wrote:
> Would it be better to set these if not already set, i.e:
>
> -CC = gcc
> -RM = rm -f
> -CFLAGS = -O2 -Wall
> +CC ?= gcc
> +RM ?= rm -f
> +CFLAGS ?= -O2 -Wall
>
> instead?
... and moving it after the two includes, so that it does not
override the values set there?
Can you ack this?
contrib/credential/wincred/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/credential/wincred/Makefile b/contrib/credential/wincred/Makefile
index 39fa5e0..6e992c0 100644
--- a/contrib/credential/wincred/Makefile
+++ b/contrib/credential/wincred/Makefile
@@ -1,12 +1,12 @@
all: git-credential-wincred.exe
-CC = gcc
-RM = rm -f
-CFLAGS = -O2 -Wall
-
-include ../../../config.mak.autogen
-include ../../../config.mak
+CC ?= gcc
+RM ?= rm -f
+CFLAGS ?= -O2 -Wall
+
prefix ?= /usr/local
libexecdir ?= $(prefix)/libexec/git-core
--
1.9.2.msysgit.0.161.g83227c1
--
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
---
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
next prev parent reply other threads:[~2014-05-13 6:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 6:46 [PATCH] wincred: add install target and avoid overwriting configured variables Stepan Kasal
2014-04-30 9:21 ` Erik Faye-Lund
2014-04-30 11:27 ` Stepan Kasal
2014-04-30 11:56 ` Erik Faye-Lund
2014-05-13 5:59 ` [PATCH 0/2] wincred makefile changes Stepan Kasal
2014-05-13 6:01 ` [PATCH 1/2] wincred: add install target Stepan Kasal
2014-05-13 6:01 ` [PATCH 2/2] wincred: avoid overwriting configured variables Stepan Kasal
2014-05-13 6:34 ` Erik Faye-Lund
2014-05-13 6:53 ` Stepan Kasal [this message]
[not found] ` <CABPQNSbb-rdTjCDYoC7uApfcMH8Q0Y-w4Tm9UiN6PhEeD-Gv6Q@mail.gmail.com>
[not found] ` <20140514084509.GA3134@camelia.ucw.cz>
2014-05-14 8:49 ` Erik Faye-Lund
2014-05-13 13:18 ` Felipe Contreras
2014-05-13 13:53 ` Stepan Kasal
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=20140513065335.GA28417@camelia.ucw.cz \
--to=kasal@ucw.cz \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=patthoyts@users.sourceforge.net \
/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).