commit: c18f677d742830eef7f88ec5edc3babf25ba803c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 19:00:46 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=c18f677d
Revert "crossdev, Makefile: fix version handling again"
This reverts commit 681c5fb86714d8e2c585c8e5ae423b6f9364ccfb.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Makefile | 5 +++--
crossdev | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 9819d92..5c483b8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@
include settings.mk
all:
- sed -i -e '/^CROSSDEV_VER=/s:.*:CROSSDEV_VER="$(PV)":g' crossdev
install:
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/
@@ -15,9 +14,11 @@ install:
PV = $(shell test -e .git && git describe)
P = crossdev-$(PV)
COMP = xz
-dist: all
+dist:
+ sed -i -e 's:@CDEVPV@:$(PV):g' crossdev
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 ee65fbc..47df8ce 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="20241215"
+CROSSDEV_VER="@CDEVPV@"
cd /
umask 0022 #159111
