Squashed 'scripts/upandaway/wicker/' changes from c0fee1f..3a24e5e

3a24e5e Tweaks to make/

git-subtree-dir: scripts/upandaway/wicker
git-subtree-split: 3a24e5e6f2e1e47e56b2e3a968fc373d59df8956
Tweaks to wicker Makefile utilities.
Some Makefile reorganization (in preparation of the packaging system)