Index: SConstruct
===================================================================
RCS file: /cvsroot/nsis/NSIS/SConstruct,v
retrieving revision 1.14
diff -u -r1.14 SConstruct
--- SConstruct	20 May 2005 11:59:17 -0000	1.14
+++ SConstruct	21 May 2005 06:54:44 -0000
@@ -29,7 +29,7 @@
 	'NSISdl',
 	'Splash',
 	'StartMenu',
-	'System',
+#	'System',
 	'UserInfo',
 	'VPatch/Source/Plugin'
 ]
Index: Contrib/NSISdl/SConscript
===================================================================
RCS file: /cvsroot/nsis/NSIS/Contrib/NSISdl/SConscript,v
retrieving revision 1.3
diff -u -r1.3 SConscript
--- Contrib/NSISdl/SConscript	30 Apr 2005 18:04:54 -0000	1.3
+++ Contrib/NSISdl/SConscript	21 May 2005 06:54:47 -0000
@@ -21,4 +21,4 @@
 
 Import('BuildPlugin')
 
-BuildPlugin(target, files, libs, docs = docs)
+BuildPlugin(target, files, libs, docs = docs, nodeflib = 0)
Index: Docs/src/SConscript
===================================================================
RCS file: /cvsroot/nsis/NSIS/Docs/src/SConscript,v
retrieving revision 1.3
diff -u -r1.3 SConscript
--- Docs/src/SConscript	30 Apr 2005 18:04:55 -0000	1.3
+++ Docs/src/SConscript	21 May 2005 06:54:48 -0000
@@ -65,7 +65,6 @@
 		Copy(build_dir, '${SOURCE.dir}/chmlink.js'),
 		Copy(build_dir, '${SOURCE.dir}/nsis.hhp'),
 		Action('cd "%s" && "%s" ${SOURCES.abspath}' % (build_dir, halibut[0].abspath)),
-		hhc_action
 	]
 )
 
@@ -75,4 +74,4 @@
 chm = env.HalibutCHM('NSIS.chm', [chm_config_but] + buts)
 env.Depends(chm, halibut)
 
-env.Distribute('', chm)
+#env.Distribute('', chm)
Index: SCons/Config/gnu
===================================================================
RCS file: /cvsroot/nsis/NSIS/SCons/Config/gnu,v
retrieving revision 1.8
diff -u -r1.8 gnu
--- SCons/Config/gnu	20 May 2005 11:23:59 -0000	1.8
+++ SCons/Config/gnu	21 May 2005 06:54:50 -0000
@@ -11,7 +11,7 @@
 ### cross compiling
 
 def cross_env(env):
-	if env['PLATFORM'] != 'win32'
+	if env['PLATFORM'] != 'win32':
 		env.Tool('crossmingw', toolpath = ['../Tools'])
 
 ### flags