From 2f0d48abe11cb53716dc7fc965505574238aaffa Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sat, 2 Jul 2022 12:13:57 +0200 Subject: [PATCH] build: Undo changes that made reconf impossible in tarball releases. Fixes #187 --- GNUmakefile.in | 3 +-- version.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index e4d13e54..3f3afb11 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -199,9 +199,8 @@ dist: rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/toolchain-detect/autom4te.cache" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/test" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/screenshot.png" - 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 a4469209..f7418d30 100755 --- a/version.sh +++ b/version.sh @@ -3,4 +3,5 @@ LC_ALL=C export LC_ALL -( 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 ] || ( 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'