Merge mainline into for_macros

util/i386/efi/grub-dumpdevtree

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-if [ x$1 == x ]; then
+if [ "x$1" = "x" ]; then
    echo "Filename required".
 fi
 

util/i386/efi/grub-install.in

@@ -145,8 +145,7 @@ else
 fi
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # If --recheck is specified, remove the device map, if present.
 if test $recheck = yes; then