:: commit ddafc630b3f98d4be53393b0c24ffc37ef78c008

mintsuki <mintsuki@protonmail.com> — 2022-07-02 10:13

parents: 8a060839fb

build: Undo changes that made reconf impossible in tarball releases. Fixes #187

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1998d451..c775d63b 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -200,9 +200,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'
tab: 248 wrap: offon