From c5c621366bbbdf248d6911e856e90131b7a7ff82 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 8 Apr 2026 16:44:07 +0200
Subject: [PATCH] scripts/usr-bin: scripts.mk -> std-targets.mk

jw-pkg is copied into $(TOPDIR)/bin during build, that's wrong.
Write a rule precisely targeted at installing /usr/bin/jw-pkg, and
cut all the scripts.mk machinery.

Also, make jw-pkg a relative link to avoid the respective RPM
warning.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/usr-bin/Makefile | 13 ++++++++++---
 scripts/usr-bin/jw-pkg   |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/usr-bin/Makefile b/scripts/usr-bin/Makefile
index 6465ef5b..69c37ad1 100644
--- a/scripts/usr-bin/Makefile
+++ b/scripts/usr-bin/Makefile
@@ -1,7 +1,14 @@
 TOPDIR = ../..
 
-EXE_PREFIX = $(ENV_PREFIX)/usr
-EXE_SH = jw-pkg
+TARGET_DIR = $(ENV_PREFIX)/usr/bin
 
 include $(TOPDIR)/make/proj.mk
-include $(JWBDIR)/make/scripts.mk
+include $(JWBDIR)/make/defs.mk
+include $(JWBDIR)/make/std-targets.mk
+
+all:
+install: install-link.done
+
+install-link.done:
+	$(INSTALL) -p -D -m $(EXEMODE) -o $(EXEOWNER) -g $(EXEGROUP) jw-pkg $(TARGET_DIR)/jw-pkg
+	touch $@
diff --git a/scripts/usr-bin/jw-pkg b/scripts/usr-bin/jw-pkg
index 81998799..d04535f5 120000
--- a/scripts/usr-bin/jw-pkg
+++ b/scripts/usr-bin/jw-pkg
@@ -1 +1 @@
-/opt/jw-pkg/bin/jw-pkg.py
\ No newline at end of file
+../../opt/jw-pkg/bin/jw-pkg.py
\ No newline at end of file