{"thread":{"id":"2734","subject":"[PATCH] Include Makefile.localdef in Makefile, if it exists.","startedAt":"2005-12-02T23:11:42Z","lastAt":"2005-12-03T19:14:43Z","messageCount":5,"participants":["Jason Riedy","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"13123","messageId":"28417.1133565102@lotus.CS.Berkeley.EDU","threadId":"2734","inReplyTo":null,"subject":"[PATCH] Include Makefile.localdef in Makefile, if it exists.","fromName":"Jason Riedy","fromEmail":"ejr@eecs.berkeley.edu","sentAt":"2005-12-02T23:11:42Z","receivedAt":"2005-12-02T23:11:42Z","isPatch":true,"sender":{"key":"ejr@eecs.berkeley.edu","avatar":"https://gravatar.com/avatar/547fa56f887cab01599edab4e9f813c949c1269e02714f20e0496c56185d9837?d=mp&s=160"},"body":"Makefile.localdef is just a hook for local definitions. Users\ncan track their definitions in a branch and not worry about\nmerge conflicts.\n\nSigned-off-by: E. Jason Riedy \n\n---\n\n Makefile | 15 +++++++++------\n 1 files changed, 9 insertions(+), 6 deletions(-)\n\napplies-to: b93e1c78095bf4ace0806ab70295931f6da28174\n65e5d3d6d31af3dda6d5cfd4e0745f34118955c3\ndiff --git a/Makefile b/Makefile\nindex df3c6eb..dc7581d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -64,18 +64,21 @@ LDFLAGS =\n ALL_CFLAGS = $(CFLAGS)\n ALL_LDFLAGS = $(LDFLAGS)\n \n-prefix = $(HOME)\n-bindir = $(prefix)/bin\n-template_dir = $(prefix)/share/git-core/templates/\n-GIT_PYTHON_DIR = $(prefix)/share/git-core/python\n-# DESTDIR=\n-\n CC = gcc\n AR = ar\n TAR = tar\n INSTALL = install\n RPMBUILD = rpmbuild\n \n+# Include local definitions, if any.\n+-include Makefile.localdef\n+\n+prefix ?= $(HOME)\n+bindir ?= $(prefix)/bin\n+template_dir ?= $(prefix)/share/git-core/templates/\n+GIT_PYTHON_DIR ?= $(prefix)/share/git-core/python\n+# DESTDIR=\n+\n # sparse is architecture-neutral, which means that we need to tell it\n # explicitly what architecture to check for. Fix this up for yours..\n SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__\n---\n0.99.9h\n"},{"id":"13129","messageId":"Pine.LNX.4.63.0512030322410.19086@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2734","inReplyTo":"28417.1133565102@lotus.CS.Berkeley.EDU","subject":"Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-12-03T02:23:17Z","receivedAt":"2005-12-03T02:23:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 2 Dec 2005, Jason Riedy wrote:\n\n> Makefile.localdef is just a hook for local definitions. Users\n> can track their definitions in a branch and not worry about\n> merge conflicts.\n\nI wonder why you do not just override them in config.mak, which was \nintroduced just for that purpose...\n\nHth,\nDscho\n"},{"id":"13135","messageId":"3061.1133591717@lotus.CS.Berkeley.EDU","threadId":"2734","inReplyTo":"Pine.LNX.4.63.0512030322410.19086@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.","fromName":"Jason Riedy","fromEmail":"ejr@eecs.berkeley.edu","sentAt":"2005-12-03T06:35:17Z","receivedAt":"2005-12-03T06:35:17Z","isPatch":true,"sender":{"key":"ejr@eecs.berkeley.edu","avatar":"https://gravatar.com/avatar/547fa56f887cab01599edab4e9f813c949c1269e02714f20e0496c56185d9837?d=mp&s=160"},"body":"And Johannes Schindelin writes:\n - I wonder why you do not just override them in config.mak, which was \n - introduced just for that purpose...\n\n'Cause I'm a git and didn't notice it, thanks. The prefix stuff \nprobably ought to be moved below the -include config.mak so \nsomeone need only change $(prefix) and not the rest. I might\nsend along such a patch, along with a note about config.mak in\nINSTALL...\n\nJason\n"},{"id":"13143","messageId":"Pine.LNX.4.63.0512031144030.20595@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2734","inReplyTo":"3061.1133591717@lotus.CS.Berkeley.EDU","subject":"Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-12-03T10:45:31Z","receivedAt":"2005-12-03T10:45:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 2 Dec 2005, Jason Riedy wrote:\n\n> And Johannes Schindelin writes:\n> - I wonder why you do not just override them in config.mak, which was \n> - introduced just for that purpose...\n> \n> 'Cause I'm a git and didn't notice it, thanks.\n\nNopraw.\n\n> The prefix stuff probably ought to be moved below the -include \n> config.mak so someone need only change $(prefix) and not the rest. I \n> might send along such a patch, along with a note about config.mak in \n> INSTALL...\n\nActually, it is a feature that you can override prefix and template_dir \nindependently.\n\nHth,\nDscho\n"},{"id":"13148","messageId":"7vmzjixaak.fsf@assigned-by-dhcp.cox.net","threadId":"2734","inReplyTo":"3061.1133591717@lotus.CS.Berkeley.EDU","subject":"Re: [PATCH] Include Makefile.localdef in Makefile, if it exists.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-03T19:14:43Z","receivedAt":"2005-12-03T19:14:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jason Riedy writes:\n\n> ... I might\n> send along such a patch, along with a note about config.mak in\n> INSTALL...\n\nPlease don't, unless you are confident your change can satisfy\n_everybody_.\n\nPeople with makefile needs that are more \"advanced\" (that is,\nsomething a simple \"-include config.mak\" cannot easily satisfy)\ncan do any number of things without touching Makefile I ship.\nExamples include:\n\n - have own makefile, include Makefile.\n\n - have onw Make script, run \"make -f Makefile\" with preset\n \"bindir=HERE NO_XXX=NoThanks\" to reduce typing.\n\n - have own makefile, whose build target depends on Make.file\n and runs \"make -f Make.file\", with a build rule for Make.file\n to munge Makefile using custom perl/sed into it.\n"}]}