* automake.in (handle_LIBOBJS): Don't rely on the caller defining $1.

diff --git a/ChangeLog b/ChangeLog
index 9dc41c2d8b6fa8311b5d599d1c42b7361ae14060..b9506a8606db95c425aa6ba01fdda64733d1b4a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-07  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (handle_LIBOBJS): Don't rely on the caller defining $1.
+
 2006-06-07  Stepan Kasal  <kasal@ucw.cz>
 
        * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Rewrite using AC_PROG_MKDIR_P.

diff --git a/automake.in b/automake.in
index 8c2269240700b5f7ad0127eb6bb4e5911ac8b3bb..73e42e027b64ba3e850bd0f6d6cdb08f3bcad8ae 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2195,8 +2195,8 @@ sub handle_LIBOBJS_or_ALLOCA ($)
 sub handle_LIBOBJS ($$$)
 {
   my ($var, $cond, $lt) = @_;
+  my $myobjext = $lt ? 'lo' : 'o';
   $lt ||= '';
-  my $myobjext = ($1 ? 'l' : '') . 'o';
 
   $var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
     if ! keys %libsources;
@@ -2234,7 +2234,7 @@ sub handle_LIBOBJS ($$$)
 sub handle_ALLOCA ($$$)
 {
   my ($var, $cond, $lt) = @_;
-  my $myobjext = ($lt ? 'l' : '') . 'o';
+  my $myobjext = $lt ? 'lo' : 'o';
   $lt ||= '';
   my $dir = handle_LIBOBJS_or_ALLOCA "${lt}ALLOCA";