Skip to content

Commit

Permalink
Merge pull request #29 from gkuiper/svn1.7
Browse files Browse the repository at this point in the history
From svn1.7 only the root dir contains a .svn dir
  • Loading branch information
ransford committed Oct 30, 2015
2 parents 89069d2 + d2635cb commit 52afd04
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.include
Expand Up @@ -97,12 +97,12 @@ else ifeq ($(shell hg root >/dev/null 2>&1 && echo USING_HG),USING_HG)
REVISION := $(shell hg id -i)
endif
VCSTURD := $(subst $(SPACE),\ ,$(shell hg root)/.hg/dirstate)
else ifneq ($(wildcard .svn/entries),)
else ifeq ($(shell svn info >/dev/null && echo USING_SVN),USING_SVN)
# subversion
ifeq ($(REVISION),)
REVISION := $(subst :,-,$(shell svnversion -n))
endif
VCSTURD := .svn/entries
VCSTURD := $(addsuffix /.svn/entries, $(shell svn info | grep 'Root Path' | sed -e 's/\(.*\:\)\(.*\) /\2/'))
endif

# .PHONY names all targets that aren't filenames
Expand Down

0 comments on commit 52afd04

Please sign in to comment.