changeset 2346:fb1c0a45f28e

Fix for /bin/sh: command substitution: line 0: unexpected EOF while looking for matching `'' - in make dsk
author chawks4
date Sat, 16 Jan 2010 18:22:49 +0000
parents fbd3b317a0ea
children 033778f5de99
files 3rdparty/packages/multivue/makefile 3rdparty/packages/uucpbb/makefile level1/coco/makefile level1/d64/makefile level1/dalpha/makefile level1/tano/makefile level2/coco3/makefile level2/coco3_6309/makefile
diffstat 8 files changed, 77 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/multivue/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/3rdparty/packages/multivue/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -4,11 +4,11 @@
 DSK63_FLOPPY	= multivue_6309.dsk
 DSK68_DW3	= multivue_6809_dw3.dsk
 DSK63_DW3	= multivue_6309_dw3.dsk
-CMDS68	= $(shell $(CD) cmds_6809; make showobjs)
-CMDS63	= $(shell $(CD) cmds_6309; make showobjs)
+CMDS68	= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
+CMDS63	= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
 ICONS	= icon.demo
-SYSBIN	= $(shell $(CD) sys; make showbinobjs)
-SYSTEXT	= $(shell $(CD) sys; make showtextobjs)
+SYSBIN	= $(shell $(CD) sys; make --no-print-directory showbinobjs)
+SYSTEXT	= $(shell $(CD) sys; make --no-print-directory showtextobjs)
 DEMO	= aif.dmo
 ROOTFILES = startup
 
--- a/3rdparty/packages/uucpbb/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/3rdparty/packages/uucpbb/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -2,12 +2,12 @@
 
 DISK68	= uucpbb21_6809.dsk
 DISK63	= uucpbb21_6309.dsk
-CMDS68		= $(shell $(CD) cmds_6809; make showobjs)
-CMDS68TCAP	= $(shell $(CD) cmds_6809; make showtcapobjs) $(CMDS68)
-CMDS68WIN	= $(shell $(CD) cmds_6809; make showwinobjs) $(CMDS68)
-CMDS63		= $(shell $(CD) cmds_6309; make showobjs)
-CMDS63TCAP	= $(shell $(CD) cmds_6309; make showtcapobjs) $(CMDS63)
-CMDS63WIN	= $(shell $(CD) cmds_6309; make showwinobjs) $(CMDS63)
+CMDS68		= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
+CMDS68TCAP	= $(shell $(CD) cmds_6809; make --no-print-directory showtcapobjs) $(CMDS68)
+CMDS68WIN	= $(shell $(CD) cmds_6809; make --no-print-directory showwinobjs) $(CMDS68)
+CMDS63		= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
+CMDS63TCAP	= $(shell $(CD) cmds_6309; make --no-print-directory showtcapobjs) $(CMDS63)
+CMDS63WIN	= $(shell $(CD) cmds_6309; make --no-print-directory showwinobjs) $(CMDS63)
 CONFIG	= Devices FileServ.help Systems bin.list Dialers Parameters active distributions
 DOCS	= adduser.man aliases.doc chown.man cnvrtmail.man fileserv.man fixtext.man login.man mailrc.doc mailx.man parameters.doc postnews.man profile.doc readnews.man rmail.man rnews.man signature.doc subscribe.man uucico.man uuclean.man uucp.man uucpbb.doc uulog.man uuxqt.man whoami.man
 
--- a/level1/coco/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level1/coco/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -27,19 +27,19 @@
 DIRS		= cmds modules defs sys bootfiles
 
 
-CMDS		= $(shell $(CD) cmds; make showobjs)
-CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
-SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 ROOTFILES	= startup
 
 PACKAGENAME	= $(DISTROVER).zip
--- a/level1/d64/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level1/d64/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -78,20 +78,20 @@
 #modules bootfiles
 #DDIRS		= modules bootfiles defs
 
-CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-CMDS525		= $(shell $(CD) cmds; make showdragon525objs)
-CMDS525_2	= $(shell $(CD) cmds; make showdragon525objs2)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showcocoobjs)
+CMDS525		= $(shell $(CD) cmds; make --no-print-directory showdragon525objs)
+CMDS525_2	= $(shell $(CD) cmds; make --no-print-directory showdragon525objs2)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
-SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 ROOTFILES	= startup
 
 PACKAGENAME	= $(DISTROVER).zip
--- a/level1/dalpha/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level1/dalpha/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -75,18 +75,18 @@
 #modules bootfiles
 #DDIRS		= modules bootfiles defs
 
-CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showcocoobjs)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
-SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 ROOTFILES	= startup
 
 PACKAGENAME	= $(DISTROVER).zip
--- a/level1/tano/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level1/tano/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -19,18 +19,18 @@
 DIRS		= cmds modules defs sys bootfiles
 
 
-CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showcocoobjs)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
-SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 ROOTFILES	= startup
 
 PACKAGENAME	= $(DISTROVER).zip
--- a/level2/coco3/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level2/coco3/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -17,20 +17,20 @@
 KERNELFILE_DW3	= bootfiles/kernel_dw3
 DIRS		= cmds modules defs sys bootfiles
 
-CMDS		= $(shell $(CD) cmds; make showobjs)
-CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= shell grfdrv del echo format makdir merge os9gen prompt tmode
 
-DEFS		= $(shell $(CD) defs; make showobjs)
-SYSBIN		= $(shell $(CD) sys; make showbinobjs)
-SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
+SYSBIN		= $(shell $(CD) sys; make --no-print-directory showbinobjs)
+SYSTEXT		= $(shell $(CD) sys; make --no-print-directory showtextobjs)
 STARTUP		= startup
 SYSGO		= sysgo_dd
 
--- a/level2/coco3_6309/makefile	Sat Jan 16 16:31:18 2010 +0000
+++ b/level2/coco3_6309/makefile	Sat Jan 16 18:22:49 2010 +0000
@@ -17,20 +17,20 @@
 KERNELFILE_DW3	= bootfiles/kernel_dw3
 DIRS		= cmds modules defs sys bootfiles
 
-CMDS		= $(shell $(CD) cmds; make showobjs)
-CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
+KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
+SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
+CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
+RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
+SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
+PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
 MODULECMDS	= shell grfdrv del echo format makdir merge os9gen prompt tmode
 
-DEFS		= $(shell $(CD) defs; make showobjs)
-SYSBIN		= $(shell $(CD) sys; make showbinobjs)
-SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
+DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
+SYSBIN		= $(shell $(CD) sys; make --no-print-directory showbinobjs)
+SYSTEXT		= $(shell $(CD) sys; make --no-print-directory showtextobjs)
 STARTUP		= startup
 SYSGO		= sysgo_dd