From: Tom Tromey <tromey@redhat.com>
Date: Sun, 12 Nov 1995 23:59:08 +0000 (+0000)
Subject: More fixes when finding common files.
X-Git-Tag: Release-0-25~353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30e615d8d6385e18885cd6e43dd4e383c7321bf5;p=thirdparty%2Fautomake.git

More fixes when finding common files.
---

diff --git a/automake.in b/automake.in
index 0cebad7ae..f390b07c3 100755
--- a/automake.in
+++ b/automake.in
@@ -251,8 +251,17 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
   amdir=`echo "$am_makefile" | sed 's,//*[^/][^/]*$,,g'`
   if test "$amdir" = "$am_makefile"; then
      # Bogus.
-     amdir=
+     amdir=.
   fi
+  # Look for certain common files and make sure they are included.
+  dlist=
+  for cfile in $common; do
+     if test -f $amdir/$cfile; then
+	dlist="$dlist $cfile"
+     fi
+  done
+  echo "DIST_COMMON = $dlist" >&4
+  # Include "dist" boilerplate.
   case "$am_makefile" in
   */*) 
      cat $AM_DIR/dist-subd-vars.am >&4
@@ -268,14 +277,6 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
      fi
      ;;
   esac
-  # Now look for certain common files and make sure they are included.
-  dlist=
-  for cfile in $common; do
-     if test -f $amdir/$cfile; then
-	dlist="$dlist $cfile"
-     fi
-  done
-  echo "DIST_COMMON = $dlist" >&4
 
   sed '/^[^#=]*:/,$d' ${am_makefile}.am >&4
   sed -n '/^[^#=]*:/,$p' ${am_makefile}.am >&5