Index: config/gen/makefiles/dynclasses.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/dynclasses.in,v
retrieving revision 1.20
diff -u -r1.20 dynclasses.in
--- config/gen/makefiles/dynclasses.in	27 Dec 2004 16:21:14 -0000	1.20
+++ config/gen/makefiles/dynclasses.in	30 Dec 2004 01:28:57 -0000
@@ -41,7 +41,7 @@
 	@$(BUILD) generate $(PMCS)
 	@$(BUILD) compile $(PMCS)
 	@$(BUILD) linklibs $(PMCS)
-	@$(BUILD) copy --destination=$(DESTDIR) $(PMCS)
+	@$(BUILD) copy "--destination=$(DESTDIR)" $(PMCS)
 
 test : all
 	cd .. ; perl -Ilib t/harness t/dynclass/*.t
Index: config/gen/makefiles/dynclasses_pl.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/dynclasses_pl.in,v
retrieving revision 1.8
diff -u -r1.8 dynclasses_pl.in
--- config/gen/makefiles/dynclasses_pl.in	29 Dec 2004 10:43:40 -0000	1.8
+++ config/gen/makefiles/dynclasses_pl.in	30 Dec 2004 01:28:57 -0000
@@ -20,8 +20,15 @@
 # Here comes some stuff for Win32.
 our $PATHQUOTE = '';
 if ($^O eq 'MSWin32') {
+    # Paths need quoting as they may contain spaces.
     $PATHQUOTE = '"';
-    $LD_LOAD_FLAGS =~ s/(def:)/def:..\\/ if $^O eq 'MSWin32';
+    
+    # Also need various libraries in the link line.
+    my $extraLibs = '${blib_lib_libparrot_a} ${blib_lib_libsicuuc_a} ' . 
+                     '${blib_lib_libsicudata_a} ${libs}';
+    $extraLibs =~ s/blib/..\\blib/g;
+    $extraLibs =~ s/\Q$(A)\E/.lib/g;
+    $LD_LOAD_FLAGS =~ s/(-def:)/$extraLibs $1..\\/;
 }
 
 # PMC2C Config