From: Tom Tromey <tromey@redhat.com>
Date: Thu, 16 Nov 1995 08:14:44 +0000 (+0000)
Subject: More bug fixes in "look for Makefile.am" code.
X-Git-Tag: Release-0-25~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcd839f4744c6ca7ae2ce6ba7064df95ad74118a;p=thirdparty%2Fautomake.git

More bug fixes in "look for Makefile.am" code.
---

diff --git a/automake.in b/automake.in
index 61b25a1e9..9f226e96d 100755
--- a/automake.in
+++ b/automake.in
@@ -69,7 +69,7 @@ done
 
 test -n "$mfiles" || {
    # Look around.
-   mfiles=*/Makefile.am
+   mfiles=`echo */Makefile.am`
    if test "$mfiles" = '*/Makefile.am'; then
       mfiles=
    else
@@ -79,13 +79,16 @@ test -n "$mfiles" || {
    if test -f Makefile.am; then
       mfiles="Makefile $mfiles"
    fi
-}
 
-test -n "$mfiles" || {
-   echo "${usage}" 1>&2
-   exit 1
+   if test -n "$mfiles"; then
+      echo "automake: using $mfiles" 1>&2
+   else
+      echo "${usage}" 1>&2
+      exit 1
+   fi
 }
 
+
 am_status=0
 
 # Remove \newline.
@@ -131,9 +134,9 @@ EOF
 for am_makefile in $mfiles
 do
   if test ! -f ${am_makefile}.am; then
-    echo "automake: ${am_makefile}.am: No such honkin' file"
-    am_status=1
-    continue
+     echo "automake: ${am_makefile}.am: No such honkin' file" 1>&2
+     am_status=1
+     continue
   fi
 
   echo creating ${am_makefile}.in