commit: 23aab902cc8d2a0ff07d86061af8e3401e990d5f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 18:53:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 00:42:06 2024 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=23aab902
crossdev, Makefile: fix version handling again
`git archive` was using HEAD so it wouldn't include the sed performed
in the `dist` target.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Makefile | 5 ++---
crossdev | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 5c483b8..9819d92 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
include settings.mk
all:
+ sed -i -e '/^CROSSDEV_VER=/s:.*:CROSSDEV_VER="$(PV)":g' crossdev
install:
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/
@@ -14,11 +15,9 @@ install:
PV = $(shell test -e .git && git describe)
P = crossdev-$(PV)
COMP = xz
-dist:
- sed -i -e 's:@CDEVPV@:$(PV):g' crossdev
+dist: all
git archive --prefix=$(P)/ HEAD > $(P).tar
-$(COMP) -f $(P).tar
du -b $(P).tar*
- sed -i -e 's:$(PV):@CDEVPV@:g' crossdev
.PHONY: all dist install
diff --git a/crossdev b/crossdev
index 47df8ce..ee65fbc 100755
--- a/crossdev
+++ b/crossdev
@@ -2,7 +2,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-CROSSDEV_VER="@CDEVPV@"
+CROSSDEV_VER="20241215"
cd /
umask 0022 #159111
