# Re: Expected Behavior? 2 messages from 2005-11-09 to 2005-11-09. Participants: Jon Loeliger, Junio C Hamano. Thread: https://gitlist.dev/t/2411 ## Jon Loeliger, 2005-11-09 13:38 Subject: Re: Expected Behavior? Message-ID: URL: https://gitlist.dev/e/E1EZqAA-0002B0-Un%40jdl.com ``` > Could you check diff between /usr/bin/git-merge-recursive and > git-merge-recursive.py in your source tree and see if the > appending to sys.path points at the right place (i.e. where the > make installs gitMergeCommon.py)? jdl.com 211 % diff /usr/src/git-core/git-merge-recursive /usr/bin/git-merge-recursive jdl.com 212 % jdl.com 213 % ll /usr/src/git-core/git-merge-recursive /usr/bin/git-merge-recursive 32 -rwxr-xr-x 1 root root 29181 Nov 8 20:17 /usr/bin/git-merge-recursive 32 -rwxr-xr-x 1 jdl src 29181 Nov 8 08:36 /usr/src/git-core/git-merge-recursive This would be a problem, though: jdl.com 216 % head -15 /usr/bin/git-merge-recursive #!/usr/bin/python import sys, math, random, os, re, signal, tempfile, stat, errno, traceback from heapq import heappush, heappop from sets import Set sys.path.append('''/home/jdl/share/git-core/python''') from gitMergeCommon import * originalIndexFile = os.environ.get('GIT_INDEX_FILE', os.environ.get('GIT_DIR', '.git') + '/index')temporaryIndexFile = os.environ.get('GIT_DIR', '.git') + \ '/merge-recursive-tmp-index' def setupIndex(temporary): try: Looks like /home/jdl/share got left instead of /usr/share. So. The root of the problem is that I followed the INSTALL instructions: Git installation Normally you can just do "make" followed by "make install", and that will install the git programs in your own ~/bin/ directory. If you want to do a global install, you can do make prefix=/usr install I ran "make" as myself, and then later I ran "make prefix=/usr install" as root. However, the path substitution happened as part of the "all" target and not as part of the "install" target: SCRIPT_PYTHON = \ git-merge-recursive.py SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ gitk git-cherry-pick all: $(PROGRAMS) $(SCRIPTS) $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py rm -f $@ sed -e '1s|#!.*python|#!$(call shq,$(PYTHON_PATH))|' \ -e 's|@@GIT_PYTHON_PATH@@|$(call shq,$(GIT_PYTHON_DIR))|g' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ $@.py >$@ chmod +x $@ So, It looks like either: 1) Change the INSTALL documentation and process to require "make prefix=/...." also during the build, or 2) Change the Makefile to do install-related path substitutions at "make install" time. My preference would be the latter (ie, take $(SCRIPTS) off the "all: " line), but you may have better notions here. Like, do people run stuff out of the build directory between a "make" and a "make install"? Dunno. jdl ``` ## Junio C Hamano, 2005-11-09 20:38 Subject: Re: Expected Behavior? Message-ID: <7v1x1peeuy.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v1x1peeuy.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Jon Loeliger writes: > Normally you can just do "make" followed by "make install", and that > will install the git programs in your own ~/bin/ directory. If you want > to do a global install, you can do > > make prefix=/usr install > > I ran "make" as myself, and then later > I ran "make prefix=/usr install" as root. Would this be explicit enough? -- >8 -- cut here -- >8 -- diff --git a/INSTALL b/INSTALL index bbb13f3..b2cdb31 100644 --- a/INSTALL +++ b/INSTALL @@ -7,8 +7,10 @@ to do a global install, you can do make prefix=/usr install -(or prefix=/usr/local, of course). Some day somebody may send me a RPM -spec file or something, and you can do "make rpm" or whatever. +(or prefix=/usr/local, of course). Just like any program suite +that uses $prefix, the built results have some paths encoded, +which are derived from $prefix, so "make all; make prefix=/usr +install" would not work. Issues of note: ```