[PATCH 2/2] wincred: avoid overwriting configured variables
- From
Stepan Kasal <kasal@ucw.cz>
- Date
- May 13, 2014, 06:53 UTC
- Message-ID
- <20140513065335.GA28417@camelia.ucw.cz>
- 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:
Show 10 quoted lines
> 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.