Fixup for issue #23.

This patch set fixes #23. In addition some wrong variable definitions needed for native OS packages were corrected, too.