Could you please test it before the submitting patches to cvs?
I've check "build" process - it seems working correctly.
But I'm not sure about "make install" and can't check it just now.
I sent the old scripts.
Current version of scripts is in the attachment.