Assorted tweaks.

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index dd78a04..b781e57 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -40,11 +40,25 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
        include_once( $fileName );
 }
 fwrite( STDERR, "\n" );
-$s = '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
+$s = 
+       "<" . "?php\n" . 
+       "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
+       '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
        '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n";
 
-$s = preg_replace( "/'" . preg_quote( $IP, '/' ) . "([^']*)'/",
-       '"$IP/\1"', $s );
+$dirs = array(
+       $IP,
+       dirname( dirname( __FILE__ ) ), 
+       realpath( $IP )
+);
+
+foreach ( $dirs as $dir ) {
+       $s = preg_replace( 
+               "/'" . preg_quote( $dir, '/' ) . "([^']*)'/",
+               '"$IP\1"', 
+               $s );
+}
+
 if ( isset( $mmfl['output'] ) ) {
        file_put_contents( $mmfl['output'], $s );
 } else {