diff --git a/GNUmakefile.in b/GNUmakefile.in index 3f6a0f1a..a6c69aa9 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -202,7 +202,6 @@ dist: rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/version.sh" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/bootstrap" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/bochsrc" - echo "$(LIMINE_VERSION)" > '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/version" cd '$(call SHESCAPE,$(BUILDDIR))' && tar -Jcf "limine-$(LIMINE_VERSION).tar.xz" "limine-$(LIMINE_VERSION)" cd '$(call SHESCAPE,$(BUILDDIR))' && tar -zcf "limine-$(LIMINE_VERSION).tar.gz" "limine-$(LIMINE_VERSION)" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" diff --git a/version.sh b/version.sh index f7418d30..ede776d5 100755 --- a/version.sh +++ b/version.sh @@ -3,5 +3,4 @@ LC_ALL=C export LC_ALL -[ -f version ] || ( git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git log -n1 --pretty='%h' ) | sed 's/^v//g' | xargs printf '%s' -[ -f version ] && ( cat version 2>/dev/null ) | xargs printf '%s' +git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git log -n1 --pretty='%h' | sed 's/^v//g' | xargs printf '%s'