On Fri, Jul 9, 2021 at 10:24 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Michael J Gruber <git@xxxxxxxxx> writes: > > > The Makefile suggests a local install and works almost as is, except for > > the python path. Make it work automatically for this typical use case, > > and give a corresponding hint in INSTALL.md. > > > > Signed-off-by: Michael J Gruber <git@xxxxxxxxx> > > --- > > INSTALL.md | 5 +++-- > > Makefile | 2 +- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/INSTALL.md b/INSTALL.md > > index 00aabb7..d479681 100644 > > --- a/INSTALL.md > > +++ b/INSTALL.md > > @@ -75,8 +75,9 @@ filter-repo only consists of a few files that need to be installed: > > You can create this symlink to (or copy of) git-filter-repo named > > git_filter-repo.py and place it in your python site packages; `python > > -c "import site; print(site.getsitepackages())"` may help you find the > > - appropriate location for your system. Alternatively, you can place > > - this file anywhere within $PYTHONPATH. > > + appropriate location for your system, `python -c "import site; > > + print(site.getusersitepackages())"` for a local install. Alternatively, > > + you can place this file anywhere within $PYTHONPATH. > > > > * git-filter-repo.1 > > > > diff --git a/Makefile b/Makefile > > index 31f5e3a..c97d1f6 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -4,7 +4,7 @@ bindir = $(prefix)/libexec/git-core > > localedir = $(prefix)/share/locale > > mandir = $(prefix)/share/man > > htmldir = $(prefix)/share/doc/git-doc > > -pythondir = $(prefix)/lib64/python3.6/site-packages > > +pythondir = $(shell python -c "import site; print(site.getusersitepackages())") > > There may be no "python" on $PATH, yet the user may have told the > make via PYTHON_PATH that /usr/bin/python3 is to be used. This was a patch for git-filter-repo.git rather than git.git; there is no PYTHON_PATH variable in the Makefile. That said, thanks for calling out python3. As the git-filter-repo script uses that, all these references to 'python' should be replaced with 'python3' (including the two in INSTALL.md from before this patch).
