Skip to content

Commit

Permalink
configury: fix git source tree is detected
Browse files Browse the repository at this point in the history
test the existence of .git in the top source tree
in order to
 - support VPATH
 - support git worktrees (.git is a file and not
   a directory)

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
  • Loading branch information
ggouaillardet committed Mar 29, 2019
1 parent 8cf5111 commit 539599a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions config/distscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2015-2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2015 Los Alamos National Security, LLC. All rights
# reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
Expand Down Expand Up @@ -42,7 +42,7 @@ fi
# Otherwise, use what configure told us, at the cost of allowing one
# or two corner cases in (but otherwise VPATH builds won't work).
repo_rev=$PMIX_REPO_REV
if test -d .git ; then
if test -e .git ; then
repo_rev=$(config/pmix_get_version.sh VERSION --repo-rev)
fi

Expand Down
2 changes: 1 addition & 1 deletion config/pmix.m4
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
# Is this a developer copy?
#

if test -d .git; then
if test -e $PMIX_TOP_SRCDIR/.git; then
PMIX_DEVEL=1
# check for Flex
AC_PROG_LEX
Expand Down

0 comments on commit 539599a

Please sign in to comment.