janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

scripts/usr-bin: scripts.mk -> std-targets.mk

Browse source 
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>
This commit is contained in:
Jan Lindemann 2026-04-08 16:44:07 +02:00
commit c5c621366b
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/usr-bin/Makefile
View file

@ -1,7 +1,14 @@
TOPDIR = ../.. TOPDIR = ../..
EXE_PREFIX = $(ENV_PREFIX)/usr TARGET_DIR = $(ENV_PREFIX)/usr/bin
EXE_SH = jw-pkg
include $(TOPDIR)/make/proj.mk 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 $@

2
scripts/usr-bin/jw-pkg
View file

@ -1 +1 @@
/opt/jw-pkg/bin/jw-pkg.py ../../opt/jw-pkg/bin/jw-pkg.py