diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-08-20 10:48:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 10:48:31 -0400 |
| commit | 2011dd77b6bd6f02f54ceef9a80a22bd373b66e2 (patch) | |
| tree | ad1fb37e8ec6545ae533a4ca31902965c538b821 /configure | |
| parent | 1e596d3a20a1a9d1ef15218ef33795bc9e651b7a (diff) | |
| download | cpython-git-2011dd77b6bd6f02f54ceef9a80a22bd373b66e2.tar.gz | |
bpo-30411: Use --git-dir instead of -C to make git work under version below 1.8.5. (GH-8744)
(cherry picked from commit 4c8555773a801f957297132a92c0acb382d640e4)
Co-authored-by: Xiang Zhang <angwerzx@126.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 4 insertions, 16 deletions
@@ -781,7 +781,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -893,7 +892,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1146,15 +1144,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1292,7 +1281,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1445,7 +1434,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2761,9 +2749,9 @@ HAS_GIT=no-repository fi if test $HAS_GIT = found then - GITVERSION="git -C \$(srcdir) rev-parse --short HEAD" - GITTAG="git -C \$(srcdir) describe --all --always --dirty" - GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD" + GITVERSION="git --git-dir \$(srcdir)/.git rev-parse --short HEAD" + GITTAG="git --git-dir \$(srcdir)/.git describe --all --always --dirty" + GITBRANCH="git --git-dir \$(srcdir)/.git name-rev --name-only HEAD" else GITVERSION="" GITTAG="" |