All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Riedy <ejr@EECS.Berkeley.EDU>
To: git@vger.kernel.org
Subject: [PATCH] Include Makefile.localdef in Makefile, if it exists.
Date: Fri, 02 Dec 2005 15:11:42 -0800	[thread overview]
Message-ID: <28417.1133565102@lotus.CS.Berkeley.EDU> (raw)

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
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

             reply	other threads:[~2005-12-02 23:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-02 23:11 Jason Riedy [this message]
2005-12-03  2:23 ` [PATCH] Include Makefile.localdef in Makefile, if it exists Johannes Schindelin
2005-12-03  6:35   ` Jason Riedy
2005-12-03 10:45     ` Johannes Schindelin
2005-12-03 19:14     ` 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=28417.1133565102@lotus.CS.Berkeley.EDU \
    --to=ejr@eecs.berkeley.edu \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.