diff options
| author | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2009-01-28 19:06:23 +0000 |
|---|---|---|
| committer | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2009-01-28 19:06:23 +0000 |
| commit | 79d8b25a355a6100cb59bdc03a326c33b0d78bc6 (patch) | |
| tree | 1d66f33d071f2d81c28aa1e31d2185cd80180c77 | |
| parent | b0215f72fe00077d3a34b0d8c496a9a3f5ceb341 (diff) | |
Prefer a git installation in $HOME/git (if it exists) over the
standard git. This makes it possible to have a preferred version
installed for Cactus.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@179 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | src/make.configuration.deps | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 937028d..100513a 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -264,7 +264,7 @@ endif GIT-SILENT = > /dev/null 2>&1 # Does git exist, or should we do nothing instead? -GIT-CMD := $(shell env PATH=$$PATH:$$HOME/git/bin which git) +GIT-CMD := $(shell env PATH=$$HOME/git/bin:$$PATH which git) HAVE-GIT := $(shell '$(GIT-CMD)' --version > /dev/null 2>&1 && echo 'true' || echo 'false') GIT1 := $(shell $(HAVE-GIT) && echo '$(SCRATCH_BUILD)/git-lock.pl $(GIT-CMD)' || { echo 'WARNING: git command not found' >&2 && echo 'true'; }) GIT := $(shell $(HAVE-GIT) && echo '$(SCRATCH_BUILD)/git-lock.pl $(GIT-CMD) $(GIT-SILENT)' || { echo 'WARNING: git command not found' >&2 && echo 'true'; }) |