[Bastian Blank] > The Makefile decides to install different versions of this file. Yes. And that should still work for s390? Or am I misunderstanding something here? BTW: Perhaps it is a good idea to drop the makefile magic, and merge the two versions into one file doing runtime detection of s390? I believe such arrangement will be less confusing.