Include scripts.am or libscripts.am in output if appropriate

diff --git a/automake.in b/automake.in
index 668b7e8..a45b7f6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -197,13 +197,23 @@ p
     done
   fi
 
+  #
+  # Boilerplate for scripts or programs.
+  #
+  if test -n "$PROGRAMS$SCRIPTS"; then
+     cat $am_dir/programs.am >&5
+  fi
+  if test -n "$SCRIPTS"; then
+     cat $am_dir/scripts.am >&5
+  fi
+  if test -n "$LIBPROGRAMS$LIBSCRIPTS"; then
+     cat $am_dir/libprograms.am >&5
+  fi
+  if test -n "$LIBSCRIPTS"; then
+     cat $am_dir/libscripts.am >&5
+  fi
+
   if test -n "$PROGRAMS$LIBPROGRAMS$SCRIPTS$LIBSCRIPTS"; then
-    if test -n "$PROGRAMS$SCRIPTS"; then
-      cat $am_dir/programs.am >&5
-    fi
-    if test -n "$LIBPROGRAMS$LIBSCRIPTS"; then
-      cat $am_dir/libprograms.am >&5
-    fi
     if test -n "$PROGRAMS$LIBPROGRAMS"; then
        for am_prog in $PROGRAMS $LIBPROGRAMS; do
          # If `prog_LDADD' is explicitly defined, use it.  Otherwise,