Skip to content

Commit b4a485a

Browse files
committed
Fix release directory name and version file location
1 parent 8bb0f44 commit b4a485a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ tag-sanitize-undefined = .san_u
3030

3131
LDFLAGS-static-yes = -static -pthread
3232

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
3535

3636
PREFIX = /usr/local
3737
DESTDIR = # root dir
@@ -154,9 +154,9 @@ kakoune-$(version).tar:
154154
@if ! [ -d .git ]; then echo "make dist can only run from a git repo"; false; fi
155155
@if git status -s | grep -qEv '^\?\?'; then echo "working tree is not clean"; false; fi
156156
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
160160

161161
distclean: clean
162162
rm -f src/kak src/kak$(suffix) src/.*.d src/*.o

0 commit comments

Comments
 (0)