Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 7275c18c02 allow build under Darwin 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu