From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 22F5C1385B3 for ; Sat, 22 Aug 2015 14:49:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EF82E0852; Sat, 22 Aug 2015 14:49:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC190E0852 for ; Sat, 22 Aug 2015 14:49:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C920340AEF for ; Sat, 22 Aug 2015 14:49:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DFF9156 for ; Sat, 22 Aug 2015 14:49:15 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1440254808.ca0a7692f607a3787d3d9fc38142a3822d3c59a9.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: / X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog configure.ac X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ca0a7692f607a3787d3d9fc38142a3822d3c59a9 X-VCS-Branch: master Date: Sat, 22 Aug 2015 14:49:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2c90171-ba61-4565-9116-57032c65d6e6 X-Archives-Hash: afbcba9751e5b8fdbe9a7f913fe38457 commit: ca0a7692f607a3787d3d9fc38142a3822d3c59a9 Author: Ulrich Müller gentoo org> AuthorDate: Sat Aug 22 14:46:48 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Aug 22 14:46:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ca0a7692 Fix revision detection for out-of-tree builds. * configure.ac (EXTRAVERSION): Fix detection of git revision for out-of-tree builds. ChangeLog | 5 +++++ configure.ac | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e5e0d5..da5fefd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-22 Ulrich Müller + + * configure.ac (EXTRAVERSION): Fix detection of git revision + for out-of-tree builds. + 2015-08-13 Ulrich Müller * configure.ac: Update version to 1.4.5. diff --git a/configure.ac b/configure.ac index a18f14e..8f38759 100644 --- a/configure.ac +++ b/configure.ac @@ -77,8 +77,9 @@ AC_SUBST(EPREFIX) # Include extra version information when building from git AC_MSG_CHECKING([whether building from git]) EXTRAVERSION="" -if test -d ${GIT_DIR:-.git}; then - COMMIT=`git describe --long --always HEAD` +eselect_git_dir=${GIT_DIR:-${srcdir}/.git} +if test -d "${eselect_git_dir}"; then + COMMIT=`GIT_DIR="${eselect_git_dir}" git describe --long --always HEAD` if test x$COMMIT != x; then EXTRAVERSION=", git commit $COMMIT" fi