Test for install-sh and mkinstalldirs

diff --git a/automake.in b/automake.in
index 810976bf48c7a494bab4b6ccb63209f0c6b4ab12..166446dff0bab37f6c6d670613e7d43f0628a826 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -444,6 +444,21 @@ p
      $echo "automake: ${am_reldir}/texinfo.tex does not exist" 1>&2
   }
 
+  case "$am_makefile" in
+   */*)
+      # In a subdirectory.
+      ;;
+
+   *)
+      # In top-level, or only, directory.
+      test -f $am_reldir/install-sh || {
+        $echo "automake: $am_reldir/install-sh does not exist" 1>&2
+      }
+      test -f $am_reldir/mkinstalldirs || {
+        $echo "automake: $am_reldir/mkinstalldirs does not exist" 1>&2
+      }
+      ;;
+  esac
 
   # Copy from Makefile.am to output.
   sed '/^[^#=]*:/,$d' ${am_makefile}.am >&4