File tree 1 file changed +5
-5
lines changed
1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -30,8 +30,8 @@ tag-sanitize-undefined = .san_u
30
30
31
31
LDFLAGS-static-yes = -static -pthread
32
32
33
- version = $(shell cat .version 2>/dev/null || git describe --tags HEAD 2>/dev/null || echo unknown)
34
- version != cat .version 2>/dev/null || git describe --tags HEAD 2>/dev/null || echo unknown
33
+ version = $(shell cat .version 2>/dev/null || git describe --tags HEAD 2>/dev/null | sed s/^v// | | echo unknown)
34
+ version != cat .version 2>/dev/null || ( git describe --tags HEAD 2>/dev/null | sed s/^v// ) || echo unknown
35
35
36
36
PREFIX = /usr/local
37
37
DESTDIR = # root dir
@@ -154,9 +154,9 @@ kakoune-$(version).tar:
154
154
@if ! [ -d .git ]; then echo " make dist can only run from a git repo" ; false ; fi
155
155
@if git status -s | grep -qEv ' ^\?\?' ; then echo " working tree is not clean" ; false ; fi
156
156
git archive --format=tar --prefix=$(@:.tar= ) / HEAD -o $@
157
- echo " $( version) " > src/ .version
158
- tar --transform " s,^,$( @:.tar=) /," -rf $@ src/ .version
159
- rm -f src/ .version
157
+ echo " $( version) " > .version
158
+ tar --transform " s,^,$( @:.tar=) /," -rf $@ .version
159
+ rm -f .version
160
160
161
161
distclean : clean
162
162
rm -f src/kak src/kak$(suffix ) src/.* .d src/* .o
You can’t perform that action at this time.
0 commit comments