--- a/specs/stx-jv.rbspec	Sat Dec 10 20:44:26 2016 +0000
+++ b/specs/stx-jv.rbspec	Mon Dec 12 22:43:48 2016 +0000
@@ -114,57 +114,40 @@
       end
     end
         
-  if win32_wine?
-
-    task :'stx:projects/smalltalk:pre' do   
-      chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do   
-        make "buildDate.h"    
-      end
-    end
-
-    task :'stx:goodies/xmlsuite/xmlreaderimpl:pre' do
-      chdir (BUILD_DIR / 'stx' / 'goodies' / 'xmlsuite' / 'xmlreaderimpl') do
-        [
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'xmlwf',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpat',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpatw',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpat_static',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpatw_static',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'examples'
-        ].each do | f |
-          if not File.exists?(f)
-            mkdir_p f
-          end
+    if win32_wine?
+      task :'stx:projects/smalltalk:pre' do   
+        chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do   
+          make "buildDate.h"    
         end
       end
-    end
+
     end
 
     # Hack for badly-named files in libtool
     task :'stx:libtool:post' do
       chdir (BUILD_DIR / 'stx' / 'libtool') do
-  # Windows does not support symlinks, copy the file
-  if win32?
-    if not File.exist? 'Tools_BrowserList.STH'
-      cp 'Tools__BrowserList.STH', 'Tools_BrowserList.STH'
-    end
-    if not File.exist? 'Tools_NavigatorModel.STH'
-      cp 'Tools__NavigatorModel.STH', 'Tools_NavigatorModel.STH'
-    end
-    if not File.exist? 'Tools_NavigationState.STH'
-      cp 'Tools__NavigationState.STH', 'Tools_NavigationState.STH'
-    end
-  else
-    if not File.exist? 'Tools_BrowserList.H'
-      ln_s 'Tools__BrowserList.H', 'Tools_BrowserList.H'
-    end
-    if not File.exist? 'Tools_NavigatorModel.H'
-      ln_s 'Tools__NavigatorModel.H', 'Tools_NavigatorModel.H'
-    end
-    if not File.exist? 'Tools_NavigationState.H'
-      ln_s 'Tools__NavigationState.H', 'Tools_NavigationState.H'
-    end
-  end
+        # Windows does not support symlinks, copy the file
+        if win32?
+          if not File.exist? 'Tools_BrowserList.STH'
+            cp 'Tools__BrowserList.STH', 'Tools_BrowserList.STH'
+          end
+          if not File.exist? 'Tools_NavigatorModel.STH'
+            cp 'Tools__NavigatorModel.STH', 'Tools_NavigatorModel.STH'
+          end
+          if not File.exist? 'Tools_NavigationState.STH'
+            cp 'Tools__NavigationState.STH', 'Tools_NavigationState.STH'
+          end
+        else
+          if not File.exist? 'Tools_BrowserList.H'
+            ln_s 'Tools__BrowserList.H', 'Tools_BrowserList.H'
+          end
+          if not File.exist? 'Tools_NavigatorModel.H'
+            ln_s 'Tools__NavigatorModel.H', 'Tools_NavigatorModel.H'
+          end
+          if not File.exist? 'Tools_NavigationState.H'
+            ln_s 'Tools__NavigationState.H', 'Tools_NavigationState.H'
+          end
+        end
       end
     end
   end