threads / patch / 2734

patchInclude Makefile.localdef in Makefile, if it exists.

Subject: [PATCH] Include Makefile.localdef in Makefile, if it exists.

## tl;dr

5 messages between Dec 2, 2005 and Dec 3, 2005. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Jason Riedy· Dec 2, 2005, 23:11 UTC · lore

Makefile.localdef is just a hook for local definitions. Users can track their definitions in a branch and not worry about merge conflicts.

Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
---
 Makefile |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

applies-to: b93e1c78095bf4ace0806ab70295931f6da28174 65e5d3d6d31af3dda6d5cfd4e0745f34118955c3

Show changes to Makefile +9 −6
diff --git a/Makefile b/Makefile
index df3c6eb..dc7581d 100644
--- a/Makefile
+++ b/Makefile
@@ -64,18 +64,21 @@ LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 
-prefix = $(HOME)
-bindir = $(prefix)/bin
-template_dir = $(prefix)/share/git-core/templates/
-GIT_PYTHON_DIR = $(prefix)/share/git-core/python
-# DESTDIR=
-
 CC = gcc
 AR = ar
 TAR = tar
 INSTALL = install
 RPMBUILD = rpmbuild
 
+# Include local definitions, if any.
+-include Makefile.localdef
+
+prefix ?= $(HOME)
+bindir ?= $(prefix)/bin
+template_dir ?= $(prefix)/share/git-core/templates/
+GIT_PYTHON_DIR ?= $(prefix)/share/git-core/python
+# DESTDIR=
+
 # sparse is architecture-neutral, which means that we need to tell it
 # explicitly what architecture to check for. Fix this up for yours..
 SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
---
0.99.9h
Johannes Schindelin· Dec 3, 2005, 02:23 UTC · re: Jason Riedy · lore

Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.

Hi,
On Fri, 2 Dec 2005, Jason Riedy wrote:
> Makefile.localdef is just a hook for local definitions.  Users
> can track their definitions in a branch and not worry about
> merge conflicts.

I wonder why you do not just override them in config.mak, which was introduced just for that purpose...

Hth, Dscho

Jason Riedy· Dec 3, 2005, 06:35 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.

And Johannes Schindelin writes:
 - I wonder why you do not just override them in config.mak, which was 
 - introduced just for that purpose...

'Cause I'm a git and didn't notice it, thanks. The prefix stuff probably ought to be moved below the -include config.mak so someone need only change $(prefix) and not the rest. I might send along such a patch, along with a note about config.mak in INSTALL...

Jason
Johannes Schindelin· Dec 3, 2005, 10:45 UTC · re: Jason Riedy · lore

Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.

Hi,
On Fri, 2 Dec 2005, Jason Riedy wrote:
Show 5 quoted lines
> And Johannes Schindelin writes:
>  - I wonder why you do not just override them in config.mak, which was 
>  - introduced just for that purpose...
> 
> 'Cause I'm a git and didn't notice it, thanks.
Nopraw.
> The prefix stuff probably ought to be moved below the -include 
> config.mak so someone need only change $(prefix) and not the rest.  I 
> might send along such a patch, along with a note about config.mak in 
> INSTALL...

Actually, it is a feature that you can override prefix and template_dir independently.

Hth, Dscho

Junio C Hamano· Dec 3, 2005, 19:14 UTC · re: Jason Riedy · lore

Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.

Jason Riedy <ejr@EECS.Berkeley.EDU> writes:
> ...  I might
> send along such a patch, along with a note about config.mak in
> INSTALL...

Please don't, unless you are confident your change can satisfy _everybody_.

People with makefile needs that are more "advanced" (that is, something a simple "-include config.mak" cannot easily satisfy) can do any number of things without touching Makefile I ship. Examples include:

 - have own makefile, include Makefile.
 - have onw Make script, run "make -f Makefile" with preset
   "bindir=HERE NO_XXX=NoThanks" to reduce typing.
 - have own makefile, whose build target depends on Make.file
   and runs "make -f Make.file", with a build rule for Make.file
   to munge Makefile using custom perl/sed into it.

← back to recent threads