Skip to content

Commit

Permalink
Merge pull request gavinbeatty#2 from mjc/master
Browse files Browse the repository at this point in the history
Fix gen-version.mk to correctly call gen-version.sh when . is not in your PATH

Thanks to mjc
  • Loading branch information
Gavin Beatty committed Sep 25, 2011
2 parents 7f7f21e + 2742d5d commit 5879f45
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions gen-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ endif
-include $(PROJECT_RELEASE_FILE)
ifeq ($(strip $($(PROJECT_VERSION_VAR))),)
$(PROJECT_VERSION_VAR)_DEP=$(PROJECT_VERSION_VAR)
$(PROJECT_VERSION_VAR): gen-version.sh .git/$(shell $(GIT) symbolic-ref HEAD)
@gen-version.sh $(PROJECT) $(PROJECT_VERSION_VAR) $(PROJECT_VERSION_VAR)
$(PROJECT_VERSION_VAR): ./gen-version.sh .git/$(shell $(GIT) symbolic-ref HEAD)
@./gen-version.sh $(PROJECT) $(PROJECT_VERSION_VAR) $(PROJECT_VERSION_VAR)
-include $(PROJECT_VERSION_VAR)
else
$(PROJECT_VERSION_VAR)_DEP=
endif
clean-version:
$(RM) $(PROJECT_VERSION_VAR)
clean: clean-version

0 comments on commit 5879f45

Please sign in to comment.