Extend 'make dist' to produce both .tar.bz2 and .zip archives, to