Put "subdir=DIR" into subdir Makefile

diff --git a/automake.in b/automake.in
index e43973f3ae151cc4698d47e4f6b8981444bec545..e8ea777b4fa1c298b2f66549a4f6e931ed3c6062 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -187,12 +187,19 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
 
   case "$am_makefile" in
   */*) 
+     amdir=`echo "$am_makefile" | sed 's,//*[^/][^/]*$,,g'`
+     echo "subdir=$amdir" >&4
      cat $AM_DIR/dist-subd-vars.am >&4
-     cat $AM_DIR/dist-subd.am >&5 ;;
+     cat $AM_DIR/dist-subd.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 ;;
+     if test -n "$SUBDIRS"; then
+       cat $AM_DIR/dist-subd-top.am >&5
+     else
+       cat $AM_DIR/dist.am >&5
+     fi
+     ;;
   esac
 
   sed '/^[^#=]*:/,$d' ${am_makefile}.am >&4