*** automake-1.5/automake.in
--- automake-1.5/automake.in
***************
*** 1941,1945 ****
  
  	# Let the language do some special magic if required.
! 	$lang->target_hook ($aggregate, $object, $full);
  
  	if ($derived_source)
--- 1941,1947 ----
  
  	# Let the language do some special magic if required.
! 	if (defined $lang) {
! 		$lang->target_hook ($aggregate, $object, $full);
! 	}
  
  	if ($derived_source)
*** automake-1.5/m4/depout.m4
--- automake-1.5/m4/depout.m4
***************
*** 13,18 ****
  for mf in $CONFIG_FILES; do
    case "$mf" in
!   Makefile) dirpart=.;;
!   */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
    *) continue;;
    esac
--- 13,18 ----
  for mf in $CONFIG_FILES; do
    case "$mf" in
!   Makefile|GNUmakefile) dirpart=.;;
!   */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
    *) continue;;
    esac