Don't refer to distname.am.

Only put footer.am in subdir Makefiles.

diff --git a/automake.in b/automake.in
index a17cd44d586eebca5c61a3449e956bf690642013..e43973f3ae151cc4698d47e4f6b8981444bec545 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -162,7 +162,8 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
   "") if grep @kr@ ${am_makefile}.am >/dev/null; then
       cat $AM_DIR/clean-kr.am >&5
       else cat $AM_DIR/clean.am >&5
-      fi ;;
+      fi
+      cat $AM_DIR/footer.am >&5 ;;
   *) cat $AM_DIR/subdirs.am >&5 ;;
   esac
 
@@ -188,14 +189,12 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
   */*) 
      cat $AM_DIR/dist-subd-vars.am >&4
      cat $AM_DIR/dist-subd.am >&5 ;;
-  *) test "$target_distname" != explicit && cat $AM_DIR/distname.am >&5
+  *)
      cat $AM_DIR/dist-vars.am >&4
      if test -n "$SUBDIRS"; then cat $AM_DIR/dist-subd-top.am >&5
      else cat $AM_DIR/dist.am >&5; fi ;;
   esac
 
-  cat $AM_DIR/footer.am >&5
-
   sed '/^[^#=]*:/,$d' ${am_makefile}.am >&4
   sed -n '/^[^#=]*:/,$p' ${am_makefile}.am >&5
   cat ${am_makefile}.vars ${am_makefile}.rules > ${am_makefile}.in