From f5fc93e6082244d9f58a8b4b12877c92c866440d Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sun, 7 Mar 2021 19:26:19 -0800 Subject: [PATCH] Include new files in package --- Makefile | 10 +++++----- package.sh | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c84d5d2..6871394 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -CAFLAGS = --target apple2enh --list-bytes 0 -LDFLAGS = --config apple2-asm.cfg +CAFLAGS := --target apple2enh --list-bytes 0 +LDFLAGS := --config apple2-asm.cfg -OUTDIR = out +OUTDIR := out -TARGETS = $(OUTDIR)/path.BIN \ +TARGETS := $(OUTDIR)/path.BIN \ $(OUTDIR)/chtype.CMD $(OUTDIR)/chtime.CMD \ $(OUTDIR)/bell.CMD $(OUTDIR)/hello.CMD $(OUTDIR)/echo.CMD $(OUTDIR)/online.CMD @@ -16,7 +16,7 @@ all: $(OUTDIR) $(TARGETS) $(OUTDIR): mkdir -p $(OUTDIR) -HEADERS = $(wildcard *.inc) +HEADERS := $(wildcard *.inc) clean: rm -f $(OUTDIR)/*.o diff --git a/package.sh b/package.sh index 3757c6c..625d7ac 100755 --- a/package.sh +++ b/package.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Use Cadius to create a disk image for distribution # https://github.com/mach-kernel/cadius @@ -18,10 +18,9 @@ add_file () { } add_file "out/path.BIN" "path#062000" -add_file "out/bell.CMD" "bell#F04000" -add_file "out/echo.CMD" "echo#F04000" -add_file "out/hello.CMD" "hello#F04000" -add_file "out/online.CMD" "online#F04000" +for file in bell echo hello online chtype chtime; do + add_file "out/${file}.CMD" "${file}#F04000" +done rm -r "$PACKDIR"