Merged Darix's changes in building done in BS only!

+ using new ruby macros only when available
Merge pull request #122 from kobliha/merge-darixs-changes-done-in-obs

Merged Darix's changes in build done in BS only!