mkpackage: Reorder the contents somewhat.

Make sure that the $EXTRA_PLATFORM_TEST file (if any) comes after
the install script in the generated tar file, so that it becomes
part of $CONTENTS when the installer is executed.

Fixes issue where the $EXTRA_PLATFORM_TEST file wasn't extracted.

Fixes [bug 7740] some more.

bin/mkpackage.pike

@@ -276,12 +276,12 @@ class Package
 			      bootstrap,
 			      setup_filename }))->wait();
 
-    packages = ({ install_filename, pike_filename }) + packages;
-
     if (extra_platform_test) {
       packages = ({ extra_platform_test }) + packages;
     }
     
+    packages = ({ install_filename, pike_filename }) + packages;
+
     string original_wd = getcwd();
     foreach(packages, string package)
     {