commit b6b18713 broke KRB5 support for make -f Makefile.orig, fix it
Make sure -j option works for make -f Makefile.orig

This also avoids the warning:
make[1]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
Merge pull request #609 from frank-dittrich/bleeding-jumbo

Bleeding jumbo: two small fixes for make -f Makefile.orig