Modified the build for system independance
Authored by: luano 2007-08-23
Parent: [r891]
Child: [r893]