From 29dffb9767d6b973c2fa9d6447783e168d7e8073 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 22 Sep 2026 17:41:32 +0200
Subject: [PATCH] pkg-dist.mk, pkg.sh: Rename dist/pckg to dist/pkg

The directory holding the built packages uses the pckg abbreviation while
every other package-related name in the build system uses pkg (PKG_PROJECT,
PKG_FORMAT, PKG_ARCH).

Rename dist/pckg to dist/pkg, in the DIST_PCKG_DIR variable and in the
recipes that hardcode the path.

Signed-off-by: Jan Lindemann <jan@janware.com>
Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.87.0
---
 make/pkg-dist.mk | 8 ++++----
 scripts/pkg.sh   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/pkg-dist.mk b/make/pkg-dist.mk
index 29b11eb7..48e9d960 100644
--- a/make/pkg-dist.mk
+++ b/make/pkg-dist.mk
@@ -39,7 +39,7 @@ include $(JWBDIR)/make/tag-defs.mk
 
 DIST_DIR                     = dist
 DIST_SRC_DIR                 = $(DIST_DIR)/src/$(PKG_PROJECT)-$(PKG_VERSION)
-DIST_PCKG_DIR                = $(DIST_DIR)/pckg
+DIST_PCKG_DIR                = $(DIST_DIR)/pkg
 
 UPLOAD_SRC_DIR               = $(DIST_PCKG_DIR)
 PCKG_TAR                    ?= $(PKG_PROJECT)-$(PKG_VERSION).tar.gz
@@ -140,7 +140,7 @@ pkg-build.dist: $(VERSION_FILE)
 pkg-update-local-repo:
 	for a in src i386 i586 i686 x86_64; do \
 		if ls dist/*/*.$$a.rpm >/dev/null 2>&1; then \
-			sudo install -m 644 dist/pckg/*.$$a.rpm $(LOCAL_REPO)/rpm/$$a/ ;\
+			sudo install -m 644 dist/pkg/*.$$a.rpm $(LOCAL_REPO)/rpm/$$a/ ;\
 		fi ;\
 	done
 	sudo sh $(LOCAL_REPO)/update.sh
@@ -288,10 +288,10 @@ pkg-release-reinstall: get-maintainer get-official get-pub pkg-release-update-ve
 	$(PKG_SH) release $(PKG_SH_BUILD_OPTS)
 ifneq ($(TARGET_HOST),)
 pkg-remote-install:
-	scp $(addprefix dist/pckg/,$(PKG_RUN_X86) $(PKG_DEVEL_X86)) root@$(TARGET_HOST):/tmp/
+	scp $(addprefix dist/pkg/,$(PKG_RUN_X86) $(PKG_DEVEL_X86)) root@$(TARGET_HOST):/tmp/
 	ssh -l root $(TARGET_HOST) rpm -U --force $(addprefix /tmp/,$(PKG_RUN_X86) $(PKG_DEVEL_X86))
 pkg-remote-install-run:
-	scp $(addprefix dist/pckg/,$(PKG_RUN_X86)) root@$(TARGET_HOST):/tmp/
+	scp $(addprefix dist/pkg/,$(PKG_RUN_X86)) root@$(TARGET_HOST):/tmp/
 	ssh -l root $(TARGET_HOST) rpm -U --force $(addprefix /tmp/,$(PKG_RUN_X86))
 ssh-remote:
 	ssh -l root $(TARGET_HOST)
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 22e4738b..e1773bde 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -1138,7 +1138,7 @@ tmp_mkdef_sh=""
 PROJECT_DESCR_FILE=$TOPDIR/make/project.conf
 DIST_SRC_DIR=dist/src
 DIST_INST_DIR=dist/src
-DIST_PCKG_DIR=dist/pckg
+DIST_PCKG_DIR=dist/pkg
 RPMBUILD_ROOT=""
 PKG_PROJECT="$PROJECT"
 PKG_REQUIRES_RUN=""