[pkgsrc/trunk]: pkgsrc/devel +========================+

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/13929a6741c4
branches:  trunk
changeset: 546049:13929a6741c4
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Aug 20 03:04:20 2008 +0000

description:
+========================+
|GIT v1.6.0 Release Notes|
+========================+

User visible changes

 - Templates now installed in ${PREFIX}/share/examples/scmgit/templates
   and registered as REQD_FILES.  Template subdirectories are
   registered in MAKE_DIRS.
 - Installing the many git-foo binaries/scripts into libexec/git-core
   is now default and better supported.  If you've written any
   scripts or use any applications which expect the git-foo commands
   to be in ${PREFIX}/bin, please do update them accordingly.

+--------------------+
|Updates since v1.5.6|
+--------------------+

(subsystems)

* git-p4 in contrib learned "allowSubmit" configuration to control on
  which branch to allow "submit" subcommand.

* git-gui learned to stage changes per-line.

(portability)

* Changes for MinGW port have been merged, thanks to Johannes Sixt and
  gangs.

* Sample hook scripts shipped in templates/ are now suffixed with
  *.sample.

(documentation)

* Updated howto/update-hook-example

* Got rid of usage of "git-foo" from the tutorial and made typography
  more consistent.

* Disambiguating "--" between revs and paths is finally documented.

(performance, robustness, sanity etc.)

* index-pack used too much memory when dealing with a deep delta chain.
  This has been optimized.

* reduced excessive inlining to shrink size of the "git" binary.

* verify-pack checks the object CRC when using version 2 idx files.

* When an object is corrupt in a pack, the object became unusable even
  when the same object is available in a loose form,  We now try harder to
  fall back to these redundant objects when able.  In particular, "git
  repack -a -f" can be used to fix such a corruption as long as necessary
  objects are available.

* Performance of "git-blame -C -C" operation is vastly improved.

* git-clone does not create refs in loose form anymore (it behaves as
  if you immediately ran git-pack-refs after cloning).  This will help
  repositories with insanely large number of refs.

* core.fsyncobjectfiles configuration can be used to ensure that the loose
  objects created will be fsync'ed (this is only useful on filesystems
  that does not order data writes properly).

* "git commit-tree" plumbing can make Octopus with more than 16 parents.
  "git commit" has been capable of this for quite some time.

(usability, bells and whistles)

* even more documentation pages are now accessible via "man" and "git help".

* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop
  the discovery process of the toplevel of working tree; this may be useful
  when you are working in a slow network disk and are outside any working
  tree, as bash-completion and "git help" may still need to run in these
  places.

* By default, stash entries never expire.  Set reflogexpire in [gc
  "refs/stash"] to a reasonable value to get traditional auto-expiration
  behaviour back

* Longstanding latency issue with bash completion script has been
  addressed.  This will need to be backmerged to 'maint' later.

* pager.<cmd> configuration variable can be used to enable/disable the
  default paging behaviour per command.

* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
  manually.

* git-am records the original tip of the branch in ORIG_HEAD before it
  starts applying patches.

* git-apply can handle a patch that touches the same path more than once
  much better than before.

* git-apply can be told not to trust the line counts recorded in the input
  patch but recount, with the new --recount option.

* git-apply can be told to apply a patch to a path deeper than what the
  patch records with --directory option.

* git-archive can be told to omit certain paths from its output using
  export-ignore attributes.

* git-archive uses the zlib default compression level when creating
  zip archive.

* git-archive's command line options --exec and --remote can take their
  parameters as separate command line arguments, similar to other commands.
  IOW, both "--exec=path" and "--exec path" are now supported.

* With -v option, git-branch describes the remote tracking statistics
  similar to the way git-checkout reports by how many commits your branch
  is ahead/behind.

* git-branch's --contains option used to always require a commit parameter
  to limit the branches with; it now defaults to list branches that
  contains HEAD if this parameter is omitted.

* git-branch's --merged and --no-merged option used to always limit the
  branches relative to the HEAD, but they can now take an optional commit
  argument that is used in place of HEAD.

* git-bundle can read the revision arguments from the standard input.

* git-cherry-pick can replay a root commit now.

* git-clone can clone from a remote whose URL would be rewritten by
  configuration stored in $HOME/.gitconfig now.

* "git-clone --mirror" is a handy way to set up a bare mirror repository.

* git-cvsserver learned to respond to "cvs co -c".

* git-diff --check now checks leftover merge conflict markers.

* "git-diff -p" learned to grab a better hunk header lines in
  BibTex, Pascal/Delphi, and Ruby files and also pays attention to
  chapter and part boundary in TeX documents.

* When remote side used to have branch 'foo' and git-fetch finds that now
  it has branch 'foo/bar', it refuses to lose the existing remote tracking
  branch and its reflog.  The error message has been improved to suggest
  pruning the remote if the user wants to proceed and get the latest set
  of branches from the remote, including such 'foo/bar'.

* fast-export learned to export and import marks file; this can be used to
  interface with fast-import incrementally.

* fast-import and fast-export learned to export and import gitlinks.

* "gitk" left background process behind after being asked to dig very deep
  history and the user killed the UI; the process is killed when the UI
  goes away now.

* git-rebase records the original tip of branch in ORIG_HEAD before it is
  rewound.

* "git rerere" can be told to update the index with auto-reused resolution
  with rerere.autoupdate configuration variable.

* git-rev-parse learned $commit^! and $commit^@ notations used in "log"
  family.  These notations are available in gitk as well, because the gitk
  command internally uses rev-parse to interpret its arguments.

* git-rev-list learned --children option to show child commits it
  encountered during the traversal, instead of showing parent commits.

* git-send-mail can talk not just over SSL but over TLS now.

* git-shortlog honors custom output format specified with
  "--pretty=format:".

* "git-stash save" learned --keep-index option.  This lets you stash away
  the local changes and bring the changes staged in the index to your
  working tree for examination and testing.

* git-stash also learned branch subcommand to create a new branch out of
  stashed changes.

* git-status gives the remote tracking statistics similar to the way
  git-checkout reports by how many commits your branch is ahead/behind.

* "git-svn dcommit" is now aware of auto-props setting the subversion user
  has.

* You can tell "git status -u" to even more aggressively omit checking
  untracked files with --untracked-files=no.

* Original SHA-1 value for "update-ref -d" is optional now.

* Error codes from gitweb are made more descriptive where possible, rather
  than "403 forbidden" as we used to issue everywhere.

(internal)

* git-merge has been reimplemented in C.

+------------------+
|Fixes since v1.5.6|
+------------------+

All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.

 * git-clone ignored its -u option; the fix needs to be backported to
   'maint';

 * git-mv used to lose the distinction between changes that are staged
   and that are only in the working tree, by staging both in the index
   after moving such a path.

 * "git-rebase -i -p" rewrote the parents to wrong ones when amending
   (either edit or squash) was involved, and did not work correctly
   when fast forwarding.

diffstat:

 devel/scmgit-base/MESSAGE          |   7 ++++
 devel/scmgit-base/Makefile         |  54 ++++++++++++++++++++++++++++++++++---
 devel/scmgit-base/PLIST            |  43 ++++++++++++++---------------
 devel/scmgit-base/distinfo         |  28 +++++++++----------
 devel/scmgit-base/patches/patch-aa |  47 +++++++++++---------------------
 devel/scmgit-base/patches/patch-ab |   4 +-
 devel/scmgit-base/patches/patch-ac |   4 +-
 devel/scmgit-base/patches/patch-ad |   6 ++--
 devel/scmgit-base/patches/patch-ae |   4 +-
 devel/scmgit-base/patches/patch-af |   6 ++--
 devel/scmgit-base/patches/patch-ag |  19 +++++++++---
 devel/scmgit-base/patches/patch-ah |   8 ++--
 devel/scmgit-base/patches/patch-ai |   4 +-
 devel/scmgit-base/patches/patch-aj |  13 ---------
 devel/scmgit-base/patches/patch-ak |  18 ------------
 devel/scmgit/Makefile.version      |   4 +-
 16 files changed, 140 insertions(+), 129 deletions(-)

diffs (truncated from 503 to 300 lines):

diff -r 54af539f8766 -r 13929a6741c4 devel/scmgit-base/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/MESSAGE Wed Aug 20 03:04:20 2008 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/08/20 03:04:20 bjs Exp $
+
+NOTE:  Pristine templates are located in:
+       ${GIT_TEMPLATE_INSTDIR}.
+
+===========================================================================
diff -r 54af539f8766 -r 13929a6741c4 devel/scmgit-base/Makefile
--- a/devel/scmgit-base/Makefile        Wed Aug 20 02:53:13 2008 +0000
+++ b/devel/scmgit-base/Makefile        Wed Aug 20 03:04:20 2008 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/08/01 10:48:11 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2008/08/20 03:04:20 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
 
 PKGNAME=               scmgit-base-${GIT_VERSION}
-PKGREVISION=           1
 COMMENT=               GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -16,7 +15,7 @@
 USE_LANGUAGES=         c99
 USE_TOOLS+=            perl:run sh:run msgfmt
 
-CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
+CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
 CONFIGURE_ARGS+=       --with-curl=${BUILDLINK_PREFIX.curl:Q}
 CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat:Q}
@@ -27,14 +26,59 @@
 BUILD_TARGET=          all
 INSTALL_TARGET=                install
 
-PERL5_CONFIGURE=       no
+PERL5_CONFIGURE=       no
 PERL5_PACKLIST=                auto/Git/.packlist
 REPLACE_PERL+=         *.perl */*.perl */*/*.perl
+REPLACE_PERL+=         contrib/hooks/update-paranoid
 
-GITCOREDIR=            ${PREFIX}/libexec/git-core
+REPLACE_SH+=           contrib/hooks/post-receive-email
+REPLACE_SH+=           contrib/hooks/pre-auto-gc-battery
+
+EGDIR=                 ${PREFIX}/share/examples/scmgit
+
+GIT_COREDIR=           git-core
+GIT_TEMPLATEDIR=       templates
+
+GIT_TEMPLATES=         description info/exclude
+GIT_TEMPLATES.samples= hooks/applypatch-msg hooks/commit-msg   \
+                       hooks/post-commit hooks/post-receive    \
+                       hooks/post-update hooks/pre-applypatch  \
+                       hooks/pre-commit hooks/pre-rebase       \
+                       hooks/prepare-commit-msg hooks/update
+GIT_TEMPLATES+=
+
+# XXX unused as of now
+#GIT_CORE_EXECDIR=     libexec/${GIT_COREDIR}
+GIT_CORE_DATADIR=      share/${GIT_COREDIR}
+GIT_CORE_TEMPLATEDIR=  ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
 
+MAKE_DIRS=             ${GIT_CORE_TEMPLATEDIR}
+MAKE_DIRS+=            ${GIT_CORE_TEMPLATEDIR}/hooks
+MAKE_DIRS+=            ${GIT_CORE_TEMPLATEDIR}/info
+
+REQD_FILES+=           ${GIT_TEMPLATES.samples:@.t.@\
+                               ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.:=.sample}\
+                               ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+                       @:M*}
+REQD_FILES+=           ${GIT_TEMPLATES:@.t.@\
+                               ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
+                               ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+                       @:M*}
+
+
+CONFIGURE_ENV+=                HOME=${PREFIX:Q}
 CONFIGURE_ENV+=                gitexecdir=${GITCOREDIR:Q}
 
+GIT_TEMPLATE_INSTDIR=  ${EGDIR}/${GIT_TEMPLATEDIR}
+MAKE_ENV+=             GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR:Q}
+MESSAGE_SUBST+=                GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
+
+SUBST_CLASSES+=                fix-paths
+SUBST_FILES.fix-paths= templates/hooks--post-receive.sample
+SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
+SUBST_STAGE.fix-paths= pre-build
+SUBST_VARS.fix-paths=  PREFIX
+
 #.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
 
 .include "options.mk"
diff -r 54af539f8766 -r 13929a6741c4 devel/scmgit-base/PLIST
--- a/devel/scmgit-base/PLIST   Wed Aug 20 02:53:13 2008 +0000
+++ b/devel/scmgit-base/PLIST   Wed Aug 20 03:04:20 2008 +0000
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2008/08/01 10:48:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/08/20 03:04:20 bjs Exp $
 bin/git
+bin/git-receive-pack
+bin/git-upload-archive
+bin/git-upload-pack
 ${PLIST.gui}bin/gitk
-libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
 libexec/git-core/git-am
@@ -75,7 +77,6 @@
 libexec/git-core/git-merge-ours
 libexec/git-core/git-merge-recursive
 libexec/git-core/git-merge-resolve
-libexec/git-core/git-merge-stupid
 libexec/git-core/git-merge-subtree
 libexec/git-core/git-merge-tree
 libexec/git-core/git-mergetool
@@ -132,26 +133,26 @@
 libexec/git-core/git-update-index
 libexec/git-core/git-update-ref
 libexec/git-core/git-update-server-info
+libexec/git-core/git-upload-pack
 libexec/git-core/git-upload-archive
-libexec/git-core/git-upload-pack
 libexec/git-core/git-var
 libexec/git-core/git-verify-pack
 libexec/git-core/git-verify-tag
 libexec/git-core/git-web--browse
 libexec/git-core/git-whatchanged
 libexec/git-core/git-write-tree
-share/git-core/templates/description
-share/git-core/templates/hooks/applypatch-msg
-share/git-core/templates/hooks/commit-msg
-share/git-core/templates/hooks/post-commit
-share/git-core/templates/hooks/post-receive
-share/git-core/templates/hooks/post-update
-share/git-core/templates/hooks/pre-applypatch
-share/git-core/templates/hooks/pre-commit
-share/git-core/templates/hooks/pre-rebase
-share/git-core/templates/hooks/prepare-commit-msg
-share/git-core/templates/hooks/update
-share/git-core/templates/info/exclude
+share/examples/scmgit/templates/description
+share/examples/scmgit/templates/hooks/applypatch-msg.sample
+share/examples/scmgit/templates/hooks/commit-msg.sample
+share/examples/scmgit/templates/hooks/post-commit.sample
+share/examples/scmgit/templates/hooks/post-receive.sample
+share/examples/scmgit/templates/hooks/post-update.sample
+share/examples/scmgit/templates/hooks/pre-applypatch.sample
+share/examples/scmgit/templates/hooks/pre-commit.sample
+share/examples/scmgit/templates/hooks/pre-rebase.sample
+share/examples/scmgit/templates/hooks/prepare-commit-msg.sample
+share/examples/scmgit/templates/hooks/update.sample
+share/examples/scmgit/templates/info/exclude
 ${PLIST.gui}share/git-gui/lib/about.tcl
 ${PLIST.gui}share/git-gui/lib/blame.tcl
 ${PLIST.gui}share/git-gui/lib/branch.tcl
@@ -203,6 +204,10 @@
 ${PLIST.gui}share/gitk/lib/msgs/es.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
+@dirrm share/examples/scmgit/templates/hooks
+@dirrm share/examples/scmgit/templates/info
+@dirrm share/examples/scmgit/templates
+@dirrm share/examples/scmgit
 ${PLIST.gui}@dirrm share/gitk/lib/msgs
 ${PLIST.gui}@dirrm share/gitk/lib
 ${PLIST.gui}@dirrm share/gitk
@@ -214,10 +219,4 @@
 ${PLIST.macosx}@dirrm share/git-gui/lib/Git Gui.app
 ${PLIST.gui}@dirrm share/git-gui/lib
 ${PLIST.gui}@dirrm share/git-gui
-@dirrm share/git-core/templates/info
-@dirrm share/git-core/templates/hooks
-@exec ${MKDIR} %D/share/git-core/templates/branches
-@dirrm share/git-core/templates/branches
-@dirrm share/git-core/templates
-@dirrm share/git-core
 @dirrm libexec/git-core
diff -r 54af539f8766 -r 13929a6741c4 devel/scmgit-base/distinfo
--- a/devel/scmgit-base/distinfo        Wed Aug 20 02:53:13 2008 +0000
+++ b/devel/scmgit-base/distinfo        Wed Aug 20 03:04:20 2008 +0000
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.12 2008/08/01 12:05:55 minskim Exp $
+$NetBSD: distinfo,v 1.13 2008/08/20 03:04:20 bjs Exp $
 
-SHA1 (git-1.5.6.4.tar.gz) = 85d7b109af3746f47840ca0ad018fa406f701854
-RMD160 (git-1.5.6.4.tar.gz) = 227f6c85e5ab9d700a228665419da5727fd24364
-Size (git-1.5.6.4.tar.gz) = 2100615 bytes
-SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
-SHA1 (patch-ab) = 519c6b2892d9483c08b08f7874790ab05bc3f2d6
-SHA1 (patch-ac) = 1f358de94d7476212c02374de888fbc372b60f32
-SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078
-SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
-SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
-SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
-SHA1 (patch-ah) = 755a28fcfaed842a503674b63cb9d59540876414
-SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
-SHA1 (patch-aj) = 54c2200363b4d2cc5eb6266c4b62d4a7fc43dd07
-SHA1 (patch-ak) = 0ebbc84a5ab56e6f7e52284e9aeef81ca7fd7f30
+SHA1 (git-1.6.0.tar.gz) = 766fbc3e0964cdecd195536746781851678f1285
+RMD160 (git-1.6.0.tar.gz) = b2a39c70a5416782ae5a36bc3f8b935249e4c7a1
+Size (git-1.6.0.tar.gz) = 2229997 bytes
+SHA1 (patch-aa) = 58483a554d681c33a66a0ad43f2141e42ba87543
+SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
+SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
+SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578
+SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
+SHA1 (patch-af) = 3a86d5563bcfb9069d31f480a7271f6eb18ea1bd
+SHA1 (patch-ag) = 427c5ca3bb0177a8f2c3f0747e7b0249a91829d1
+SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
+SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff -r 54af539f8766 -r 13929a6741c4 devel/scmgit-base/patches/patch-aa
--- a/devel/scmgit-base/patches/patch-aa        Wed Aug 20 02:53:13 2008 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Wed Aug 20 03:04:20 2008 +0000
@@ -1,29 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2008/02/10 19:00:27 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2008/08/20 03:04:20 bjs Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig      2008-02-02 05:09:01.000000000 +0100
+--- Makefile.orig      2008-08-17 16:43:06.000000000 -0400
 +++ Makefile
-@@ -150,13 +150,11 @@ uname_P := $(shell sh -c 'uname -p 2>/de
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
+@@ -217,12 +217,8 @@ GITWEB_SITE_FOOTER =
  
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
- 
--prefix = $(HOME)
-+prefix = $(PREFIX)
- bindir = $(prefix)/bin
- mandir = $(prefix)/share/man
- infodir = $(prefix)/share/info
-@@ -192,12 +190,8 @@ GITWEB_SITE_FOOTER =
- 
- export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
+ export prefix bindir sharedir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -34,7 +19,7 @@
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -421,9 +415,10 @@ ifeq ($(uname_S),Darwin)
+@@ -628,9 +624,10 @@ ifeq ($(uname_S),Darwin)
        NO_MEMMEM = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -46,7 +31,7 @@
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
-@@ -441,8 +436,6 @@ ifeq ($(uname_S),SunOS)
+@@ -648,8 +645,6 @@ ifeq ($(uname_S),SunOS)
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
@@ -55,7 +40,7 @@
        BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -476,9 +469,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -684,9 +679,7 @@ ifeq ($(uname_S),OpenBSD)
        BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -66,7 +51,7 @@
        BASIC_CFLAGS += -I/usr/pkg/include
        BASIC_LDFLAGS += -L/usr/pkg/lib
        ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -779,7 +770,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -1046,7 +1039,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -75,18 +60,18 @@
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
        $(COMPAT_CFLAGS)
-@@ -1047,10 +1038,10 @@ remove-dashes:
- ### Installation rules
+@@ -1348,10 +1341,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+ export gitexec_instdir
  
  install: all
 -      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
--      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'