From 6a273c567bfe352fd9a09ce95d903dc2110dc9d9 Mon Sep 17 00:00:00 2001 From: "Cameron Armstrong (Nightfox)" Date: Mon, 24 Aug 2026 02:28:34 +0800 Subject: [PATCH] add json-c directory to root of lha --- README.md | 8 ++++---- json-c.readme | 2 +- package-amiga.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5d33b21..6af6456 100644 --- a/README.md +++ b/README.md @@ -417,12 +417,12 @@ The clib2 failures are inside clib2 itself: its 68000 multilib provides no DREL16* once json-c's data is added -- `-fbaserel32` has no 64 KB limit. Link with `-ljson-c -lm` after your own objects, and add `-lunix` for clib2. -The archive is laid out with the readme at the root and one directory per -system, each following the compiler's own layout so it can be copied straight -over an SDK: +The archive is a single `json-c/` directory at the root, with the readme and +one directory per system, each following the compiler's own layout so it can +be copied straight over an SDK: ``` -json-c.readme +json-c/json-c.readme json-c/AmigaOS3/{include,lib,...}/ plus libnix/ and clib2/ subtrees json-c/AmigaOS4/{include,lib,lib/clib2,lib/clib4}/ json-c/MorphOS/{include,lib,lib/libb32,lib/libnix}/ diff --git a/json-c.readme b/json-c.readme index 8c3940e..3bebf37 100644 --- a/json-c.readme +++ b/json-c.readme @@ -16,7 +16,7 @@ contains static libraries and public headers for Amiga development. Contents - json-c.readme this file + json-c/json-c.readme this file json-c/AmigaOS3/... m68k AmigaOS libraries and headers json-c/AmigaOS4/... ppc-amigaos libraries and headers json-c/MorphOS/... ppc-morphos libraries and headers diff --git a/package-amiga.sh b/package-amiga.sh index 075991f..f99300e 100755 --- a/package-amiga.sh +++ b/package-amiga.sh @@ -4,8 +4,8 @@ # # ./package-amiga.sh [OS ...] # default: all three # -# Archive layout: -# json-c.readme at the archive root +# Archive layout (single directory at the root): +# json-c/json-c.readme # json-c/AmigaOS3/... per-OS libraries and headers # json-c/AmigaOS4/... # json-c/MorphOS/... @@ -23,7 +23,7 @@ command -v lha >/dev/null || { echo "error: lha not found on PATH" >&2; exit 1; # script's SDK layout ($SDK/) is the same shape we want per OS, so each # OS gets staged under its own directory. rm -rf "$DIST"; mkdir -p "$STAGE/json-c" -cp "$ROOT/json-c.readme" "$STAGE/json-c.readme" +cp "$ROOT/json-c.readme" "$STAGE/json-c/json-c.readme" built=() for os in "${OSES[@]}"; do