Mercurial > hg > Members > kono > nitros9-code

changeset 3292:e54bf7fbc50f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rules.mak: Make os9 command settable Mainly for testing toolshed or if os9 is not in the path.
author Tormod Volden <debian.tormod@gmail.com>
date Thu, 23 Sep 2021 22:58:22 +0200
parents c467fd80252c
children aa5c87cbbd32
files rules.mak
diffstat 1 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/rules.mak	Tue Sep 21 18:20:25 2021 -0700
+++ b/rules.mak	Thu Sep 23 22:58:22 2021 +0200
@@ -21,6 +21,7 @@
 #################### DO NOT CHANGE ANYTHING BELOW THIS LINE ####################
 
 CC		= c3
+OS9		= os9
 
 NITROS9VER	= v0$(NOS9VER)0$(NOS9MAJ)0$(NOS9MIN)
 
@@ -53,35 +54,35 @@
 LWAR		= lwar -c
 
 # Commands
-MAKDIR		= os9 makdir
+MAKDIR		= $(OS9) makdir
 RM		= rm -f
 MERGE		= cat
 MOVE		= mv
 ECHO		= echo
 CD		= cd
 CP		= cp
-OS9COPY		= os9 copy -o=0
+OS9COPY		= $(OS9) copy -o=0
 CPL		= $(OS9COPY) -l
 TAR		= tar
 CHMOD		= chmod
-IDENT		= os9 ident
+IDENT		= $(OS9) ident
 IDENT_SHORT	= $(IDENT) -s
 #UNIX2OS9	= u2o
 #OS92UNIX	= o2u
-OS9FORMAT	= os9 format -e
-OS9FORMAT_SS35	= os9 format -e -t35 -ss -dd
-OS9FORMAT_SS40	= os9 format -e -t40 -ss -dd
-OS9FORMAT_SS80	= os9 format -e -t80 -ss -dd
-OS9FORMAT_DS40	= os9 format -e -t40 -ds -dd
-OS9FORMAT_DS80	= os9 format -e -t80 -ds -dd
-OS9FORMAT_DW	= os9 format -t29126 -ss -dd
-OS9FORMAT_SDC	= os9 format -e -t29126 -ss -dd
-OS9GEN		= os9 gen
-OS9RENAME	= os9 rename
-OS9ATTR		= os9 attr -q
+OS9FORMAT	= $(OS9) format -e
+OS9FORMAT_SS35	= $(OS9) format -e -t35 -ss -dd
+OS9FORMAT_SS40	= $(OS9) format -e -t40 -ss -dd
+OS9FORMAT_SS80	= $(OS9) format -e -t80 -ss -dd
+OS9FORMAT_DS40	= $(OS9) format -e -t40 -ds -dd
+OS9FORMAT_DS80	= $(OS9) format -e -t80 -ds -dd
+OS9FORMAT_DW	= $(OS9) format -t29126 -ss -dd
+OS9FORMAT_SDC	= $(OS9) format -e -t29126 -ss -dd
+OS9GEN		= $(OS9) gen
+OS9RENAME	= $(OS9) rename
+OS9ATTR		= $(OS9) attr -q
 OS9ATTR_TEXT	= $(OS9ATTR) -npe -npw -pr -ne -w -r
 OS9ATTR_EXEC	= $(OS9ATTR) -pe -npw -pr -e -w -r
-PADROM		= os9 padrom
+PADROM		= $(OS9) padrom
 MOUNT		= sudo mount
 UMOUNT		= sudo umount
 LOREMOVE	= sudo losetup -d