Index: scheme.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/scheme.in,v
retrieving revision 1.6
diff -u -w -b -r1.6 scheme.in
--- scheme.in	12 Aug 2003 15:36:16 -0000	1.6
+++ scheme.in	21 Sep 2003 23:45:41 -0000
@@ -7,11 +7,11 @@
 PERL = ${perl}
 RM_F = ${rm_f}
 
-DIR=languages/scheme
-TOOL_DIR=../..
-ASM = ../../parrot
+DIR=languages${slash}scheme
+TOOL_DIR=..${slash}..
+ASM = ..${slash}..${slash}parrot
 SCHEMEC=$(PERL) schemec
-INTERP=./${test_prog}
+INTERP=.${slash}${test_prog}
 
 #
 # Default target:
@@ -23,7 +23,7 @@
 foo: foo.scheme schemec
 	$(SCHEMEC) foo.scheme > foo.pasm
 	$(ASM) -o foo.pbc foo.pasm
-	cd $(TOOL_DIR); $(INTERP) $(DIR)/foo.pbc
+	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}foo.pbc
 	cat foo.pasm
 
 #
@@ -60,20 +60,20 @@
 
 clean:
 	$(RM_F) foo.pasm foo.pbc \
-	        t/*/*.pasm \
-	        t/*/*.pbc \
-	        t/*/*.scheme \
-	        t/*/*.out
+	        t${slash}*${slash}*.pasm \
+	        t${slash}*${slash}*.pbc \
+	        t${slash}*${slash}*.scheme \
+	        t${slash}*${slash}*.out
 
 over:
 	@$(MAKE) clean
 	@$(MAKE) all
 
 test:
-	$(PERL) t/harness
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/test.pbc
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/and.pbc
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/foo.pbc
+	$(PERL) t${slash}harness
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}test.pbc
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}and.pbc
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}foo.pbc
 
 #
 # End of file.
Index: perl6.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/perl6.in,v
retrieving revision 1.9
diff -u -w -b -r1.9 perl6.in
--- perl6.in	12 Aug 2003 07:57:33 -0000	1.9
+++ perl6.in	21 Sep 2003 23:45:43 -0000
@@ -2,18 +2,18 @@
 RM_RF = ${rm_rf}
 PERL = ${perl}
 
-myperl=$(PERL) -I../../lib
+myperl=$(PERL) -I..${slash}..${slash}lib
 compile=$(myperl) prd-perl6.pl --batch --imc
 imcc=..${slash}imcc${slash}imcc
 asm=$(imcc) -a --output-pbc
 
 all: imcc perl6-config
 
-perl6-config: ../../Makefile pconfig.pl
-	$(myperl) pconfig.pl ../../Makefile perl6-config
+perl6-config: ..${slash}..${slash}Makefile pconfig.pl
+	$(myperl) pconfig.pl ..${slash}..${slash}Makefile perl6-config
 
 test:
-	$(PERL) t/harness
+	$(PERL) t${slash}harness
 
 imcc:
 	cd ..${slash}imcc && $(MAKE)
@@ -28,8 +28,8 @@
 	$(asm) -o $@ $<
 
 clean:
-	$(RM_RF) t/*/*.p6 t/*/*.imc t/*/*.pasm t/*/*.err t/*/*.pbc t/*/*.out
-	$(RM_RF) a.err a.imc a.output a.pasm a.pbc t/*/*.warn t/*/*.test
+	$(RM_RF) t${slash}*${slash}*.p6 t${slash}*${slash}*.imc t${slash}*${slash}*.pasm t${slash}*${slash}*.err t${slash}*${slash}*.pbc t${slash}*${slash}*.out
+	$(RM_RF) a.err a.imc a.output a.pasm a.pbc t${slash}*${slash}*.warn t${slash}*${slash}*.test
 	$(RM_RF) core
 
 
Index: ook.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/ook.in,v
retrieving revision 1.4
diff -u -w -b -r1.4 ook.in
--- ook.in	16 Jul 2003 01:37:32 -0000	1.4
+++ ook.in	21 Sep 2003 23:45:43 -0000
@@ -1,6 +1,6 @@
 RM_F = ${rm_f}
 
-PARROT = ../../parrot
+PARROT = ..${slash}..${slash}parrot
 
 all: build
 
Index: miniperl.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/miniperl.in,v
retrieving revision 1.4
diff -u -w -b -r1.4 miniperl.in
--- miniperl.in	12 Aug 2003 07:57:33 -0000	1.4
+++ miniperl.in	21 Sep 2003 23:45:43 -0000
@@ -5,12 +5,12 @@
 #
 
 PERL=${perl}
-DIR=languages/miniperl
-TOOL_DIR=../..
-IMCC=../imcc/imcc${exe}
+DIR=languages${slash}miniperl
+TOOL_DIR=..${slash}..
+IMCC=..${slash}imcc${slash}imcc${exe}
 ASM=$(IMCC) -a --output-pbc
 MINIPERLC=$(PERL) miniperlc
-INTERP=./${test_prog}
+INTERP=.${slash}${test_prog}
 
 #
 # Default target:
@@ -22,7 +22,7 @@
 foo: foo.mpl miniperlc
 	$(MINIPERLC) foo.mpl > foo.pasm
 	$(ASM) -o foo.pbc foo.pasm
-	cd $(TOOL_DIR); $(INTERP) $(DIR)/foo.pbc
+	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}foo.pbc
 	cat foo.pasm
 
 #
@@ -60,20 +60,20 @@
 clean:
 	rm -f \
 foo.pasm foo.pbc \
-t/*/*.pasm \
-t/*/*.pbc \
-t/*/*.mpl \
-t/*/*.out
+t${slash}*${slash}*.pasm \
+t${slash}*${slash}*.pbc \
+t${slash}*${slash}*.mpl \
+t${slash}*${slash}*.out
 
 over:
 	@make clean
 	@make all
 
 test:
-	t/harness
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/test.pbc
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/and.pbc
-#	cd $(TOOL_DIR); $(INTERP) $(DIR)/foo.pbc
+	t${slash}harness
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}test.pbc
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}and.pbc
+#	cd $(TOOL_DIR); $(INTERP) $(DIR)${slash}foo.pbc
 
 #
 # End of file.
Index: jako.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/jako.in,v
retrieving revision 1.13
diff -u -w -b -r1.13 jako.in
--- jako.in	16 Sep 2003 08:27:48 -0000	1.13
+++ jako.in	21 Sep 2003 23:45:43 -0000
@@ -7,12 +7,12 @@
 PERL = ${perl}
 RM_F = ${rm_f}
 
-DIR=languages/jako
-TOOL_DIR=../..
-IMCC=../imcc/imcc${exe}
+DIR=languages${slash}jako
+TOOL_DIR=..${slash}..
+IMCC=..${slash}imcc${slash}imcc${exe}
 ASM=$(IMCC) -a --output-pbc
 JAKOC=$(PERL) -I lib jakoc
-INTERP=../../${test_prog}
+INTERP=..${slash}..${slash}${test_prog}
 
 .SUFFIXES: .jako .imc .pasm .pbc
 
@@ -22,22 +22,22 @@
 #
 
 all: \
-	examples/bench.pbc      \
-	examples/board.pbc      \
-	examples/euclid.pbc     \
-	examples/fact.pbc       \
-	examples/fib.pbc        \
-	examples/hello.pbc      \
-	examples/leibniz.pbc    \
-	examples/life.pbc       \
-	examples/mandelbrot.pbc \
-	examples/mandelzoom.pbc \
-	examples/mops.pbc       \
-	examples/nci.pbc        \
-	examples/pmc.pbc        \
-	examples/primes.pbc     \
-	examples/queens.pbc     \
-	examples/sub.pbc
+	examples${slash}bench.pbc      \
+	examples${slash}board.pbc      \
+	examples${slash}euclid.pbc     \
+	examples${slash}fact.pbc       \
+	examples${slash}fib.pbc        \
+	examples${slash}hello.pbc      \
+	examples${slash}leibniz.pbc    \
+	examples${slash}life.pbc       \
+	examples${slash}mandelbrot.pbc \
+	examples${slash}mandelzoom.pbc \
+	examples${slash}mops.pbc       \
+	examples${slash}nci.pbc        \
+	examples${slash}pmc.pbc        \
+	examples${slash}primes.pbc     \
+	examples${slash}queens.pbc     \
+	examples${slash}sub.pbc
 
 
 #
@@ -47,22 +47,22 @@
 .jako.imc:
 	$(JAKOC) $< > $@ || (rm -f $@ && false)
 
-examples/bench.imc:      examples/bench.jako      jakoc
-examples/board.imc:      examples/board.jako      jakoc
-examples/euclid.imc:     examples/euclid.jako     jakoc
-examples/fact.imc:       examples/fact.jako       jakoc
-examples/fib.imc:        examples/fib.jako        jakoc
-examples/hello.imc:      examples/hello.jako      jakoc
-examples/leibniz.imc:    examples/leibniz.jako    jakoc
-examples/life.imc:       examples/life.jako       jakoc
-examples/mandelbrot.imc: examples/mandelbrot.jako jakoc
-examples/mandelzoom.imc: examples/mandelzoom.jako jakoc
-examples/mops.imc:       examples/mops.jako       jakoc
-examples/nci.imc:        examples/nci.jako        jakoc
-examples/pmc.imc:        examples/pmc.jako        jakoc
-examples/primes.imc:     examples/primes.jako     jakoc
-examples/queens.imc:     examples/queens.jako     jakoc
-examples/sub.imc:        examples/sub.jako        jakoc
+examples${slash}bench.imc:      examples${slash}bench.jako      jakoc
+examples${slash}board.imc:      examples${slash}board.jako      jakoc
+examples${slash}euclid.imc:     examples${slash}euclid.jako     jakoc
+examples${slash}fact.imc:       examples${slash}fact.jako       jakoc
+examples${slash}fib.imc:        examples${slash}fib.jako        jakoc
+examples${slash}hello.imc:      examples${slash}hello.jako      jakoc
+examples${slash}leibniz.imc:    examples${slash}leibniz.jako    jakoc
+examples${slash}life.imc:       examples${slash}life.jako       jakoc
+examples${slash}mandelbrot.imc: examples${slash}mandelbrot.jako jakoc
+examples${slash}mandelzoom.imc: examples${slash}mandelzoom.jako jakoc
+examples${slash}mops.imc:       examples${slash}mops.jako       jakoc
+examples${slash}nci.imc:        examples${slash}nci.jako        jakoc
+examples${slash}pmc.imc:        examples${slash}pmc.jako        jakoc
+examples${slash}primes.imc:     examples${slash}primes.jako     jakoc
+examples${slash}queens.imc:     examples${slash}queens.jako     jakoc
+examples${slash}sub.imc:        examples${slash}sub.jako        jakoc
 
 
 #
@@ -72,27 +72,27 @@
 .imc.pasm:
 	$(IMCC) -o $@ $< || (rm -f $@ && false)
 
-../imcc/imcc:
+..${slash}imcc${slash}imcc:
 
-imcc: ../imcc/imcc${exe}
-	@cd ../imcc && $(MAKE) && cd ../jako
+imcc: ..${slash}imcc${slash}imcc${exe}
+	@cd ..${slash}imcc && $(MAKE) && cd ..${slash}jako
 
-examples/bench.pasm:      examples/bench.imc      imcc
-examples/board.pasm:      examples/board.imc      imcc
-examples/euclid.pasm:     examples/euclid.imc     imcc
-examples/fact.pasm:       examples/fact.imc       imcc
-examples/fib.pasm:        examples/fib.imc        imcc
-examples/hello.pasm:      examples/hello.imc      imcc
-examples/leibniz.pasm:    examples/leibniz.imc    imcc
-examples/life.pasm:       examples/life.imc       imcc
-examples/mandelbrot.pasm: examples/mandelbrot.imc imcc
-examples/mandelzoom.pasm: examples/mandelzoom.imc imcc
-examples/mops.pasm:       examples/mops.imc       imcc
-examples/nci.pasm:        examples/nci.imc        imcc
-examples/pmc.pasm:        examples/pmc.imc        imcc
-examples/primes.pasm:     examples/primes.imc     imcc
-examples/queens.pasm:     examples/queens.imc     imcc
-examples/sub.pasm:        examples/sub.imc        imcc
+examples${slash}bench.pasm:      examples${slash}bench.imc      imcc
+examples${slash}board.pasm:      examples${slash}board.imc      imcc
+examples${slash}euclid.pasm:     examples${slash}euclid.imc     imcc
+examples${slash}fact.pasm:       examples${slash}fact.imc       imcc
+examples${slash}fib.pasm:        examples${slash}fib.imc        imcc
+examples${slash}hello.pasm:      examples${slash}hello.imc      imcc
+examples${slash}leibniz.pasm:    examples${slash}leibniz.imc    imcc
+examples${slash}life.pasm:       examples${slash}life.imc       imcc
+examples${slash}mandelbrot.pasm: examples${slash}mandelbrot.imc imcc
+examples${slash}mandelzoom.pasm: examples${slash}mandelzoom.imc imcc
+examples${slash}mops.pasm:       examples${slash}mops.imc       imcc
+examples${slash}nci.pasm:        examples${slash}nci.imc        imcc
+examples${slash}pmc.pasm:        examples${slash}pmc.imc        imcc
+examples${slash}primes.pasm:     examples${slash}primes.imc     imcc
+examples${slash}queens.pasm:     examples${slash}queens.imc     imcc
+examples${slash}sub.pasm:        examples${slash}sub.imc        imcc
 
 
 #
@@ -102,22 +102,22 @@
 .pasm.pbc:
 	$(ASM) -o $@ $<
 
-examples/bench.pbc:      examples/bench.pasm
-examples/board.pbc:      examples/board.pasm
-examples/euclid.pbc:     examples/euclid.pasm
-examples/fact.pbc:       examples/fact.pasm
-examples/fib.pbc:        examples/fib.pasm
-examples/hello.pbc:      examples/hello.pasm
-examples/leibniz.pbc:    examples/leibniz.pasm
-examples/life.pbc:       examples/life.pasm
-examples/mandelbrot.pbc: examples/mandelbrot.pasm
-examples/mandelzoom.pbc: examples/mandelzoom.pasm
-examples/mops.pbc:       examples/mops.pasm
-examples/nci.pbc:        examples/nci.pasm
-examples/pmc.pbc:        examples/pmc.pasm
-examples/primes.pbc:     examples/primes.pasm
-examples/queens.pbc:     examples/queens.pasm
-examples/sub.pbc:        examples/sub.pasm
+examples${slash}bench.pbc:      examples${slash}bench.pasm
+examples${slash}board.pbc:      examples${slash}board.pasm
+examples${slash}euclid.pbc:     examples${slash}euclid.pasm
+examples${slash}fact.pbc:       examples${slash}fact.pasm
+examples${slash}fib.pbc:        examples${slash}fib.pasm
+examples${slash}hello.pbc:      examples${slash}hello.pasm
+examples${slash}leibniz.pbc:    examples${slash}leibniz.pasm
+examples${slash}life.pbc:       examples${slash}life.pasm
+examples${slash}mandelbrot.pbc: examples${slash}mandelbrot.pasm
+examples${slash}mandelzoom.pbc: examples${slash}mandelzoom.pasm
+examples${slash}mops.pbc:       examples${slash}mops.pasm
+examples${slash}nci.pbc:        examples${slash}nci.pasm
+examples${slash}pmc.pbc:        examples${slash}pmc.pasm
+examples${slash}primes.pbc:     examples${slash}primes.pasm
+examples${slash}queens.pbc:     examples${slash}queens.pasm
+examples${slash}sub.pbc:        examples${slash}sub.pasm
 
 
 #
@@ -125,29 +125,29 @@
 #
 
 clean:
-	$(RM_F) examples/*.imc examples/*.pasm examples/*.list examples/*.pbc
+	$(RM_F) examples${slash}*.imc examples${slash}*.pasm examples${slash}*.list examples${slash}*.pbc
 
 over:
 	@$(MAKE) clean
 	@$(MAKE) all
 
 test: all
-	$(INTERP) examples/bench.pbc
-	$(INTERP) examples/board.pbc
-	$(INTERP) examples/euclid.pbc
-	$(INTERP) examples/fact.pbc
-	$(INTERP) examples/fib.pbc
-	$(INTERP) examples/hello.pbc
-	$(INTERP) examples/leibniz.pbc
-#	$(INTERP) examples/life.pbc
-	$(INTERP) examples/mandelbrot.pbc
-	$(INTERP) examples/mandelzoom.pbc
-	$(INTERP) examples/mops.pbc
-	$(INTERP) examples/nci.pbc
-	$(INTERP) examples/pmc.pbc
-	$(INTERP) examples/primes.pbc
-	$(INTERP) examples/queens.pbc
-	$(INTERP) examples/sub.pbc
+	$(INTERP) examples${slash}bench.pbc
+	$(INTERP) examples${slash}board.pbc
+	$(INTERP) examples${slash}euclid.pbc
+	$(INTERP) examples${slash}fact.pbc
+	$(INTERP) examples${slash}fib.pbc
+	$(INTERP) examples${slash}hello.pbc
+	$(INTERP) examples${slash}leibniz.pbc
+#	$(INTERP) examples${slash}life.pbc
+	$(INTERP) examples${slash}mandelbrot.pbc
+	$(INTERP) examples${slash}mandelzoom.pbc
+	$(INTERP) examples${slash}mops.pbc
+	$(INTERP) examples${slash}nci.pbc
+	$(INTERP) examples${slash}pmc.pbc
+	$(INTERP) examples${slash}primes.pbc
+	$(INTERP) examples${slash}queens.pbc
+	$(INTERP) examples${slash}sub.pbc
 
 
 #
Index: bf.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/bf.in,v
retrieving revision 1.4
diff -u -w -b -r1.4 bf.in
--- bf.in	6 Jul 2003 22:35:20 -0000	1.4
+++ bf.in	21 Sep 2003 23:45:43 -0000
@@ -1,7 +1,7 @@
 RM_F = ${rm_f}
 
-PARROT=../../parrot
-IMCC=../imcc/imcc
+PARROT=..${slash}..${slash}parrot
+IMCC=..${slash}imcc${slash}imcc
 
 all: build
 
Index: befunge.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/befunge.in,v
retrieving revision 1.4
diff -u -w -b -r1.4 befunge.in
--- befunge.in	5 Jul 2003 03:38:43 -0000	1.4
+++ befunge.in	21 Sep 2003 23:45:43 -0000
@@ -1,6 +1,6 @@
 RM_F = ${rm_f}
 
-PARROT = ../../parrot
+PARROT = ..${slash}..${slash}parrot
 ASSEMBLE = $(PARROT)
 
 all: build