[Bug-gnulib] gnulib-tool

[Simon Josefsson]

I installed some small fixes.

2004-10-16  Simon Josefsson  <address@hidden>

        * gnulib-tool: Fix comments.  Fix parse problem.
        (func_emit_lib_Makefile_am): Don't hard code a in libgl_a_SOURCES.

Index: gnulib-tool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.34
diff -u -p -u -w -r1.34 gnulib-tool
--- gnulib-tool 15 Oct 2004 20:20:11 -0000      1.34
+++ gnulib-tool 15 Oct 2004 22:56:07 -0000
@@ -455,7 +455,7 @@ func_emit_lib_Makefile_am ()
     func_verify_module
     if test -n "$module"; then
       {
-        func_get_automake_snippet "$module" | sed -e 
"s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
+        func_get_automake_snippet "$module" | sed -e 
"s,lib_SOURCES,${libname}_${libext}_SOURCES,g" -e 
"s,lib_OBJECTS,${libname}_${libext}_OBJECTS,g"
         if test "$module" = 'alloca'; then
           echo "${libname}_${libext}_LIBADD += @{perhapsLT}ALLOCA@"
         fi
@@ -471,6 +471,8 @@ func_emit_lib_Makefile_am ()
       rm -f amsnippet.tmp
     fi
   done
+  echo
+  echo "# Makefile.am ends here"
 }
 
 # func_import modules
@@ -547,10 +549,7 @@ func_import ()
   if test -z "$dry_run"; then
     func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am
   else
-    echo "# $destdir/$sourcebase/Makefile.am"
     func_emit_lib_Makefile_am
-    echo
-    echo "# Makefile.am ends here"
   fi
 
   # Create gnulib.m4.
@@ -589,7 +588,7 @@ func_import ()
       func_verify_module
       if test -n "$module"; then
         func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/  /' -e 
's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or 
similar to configure.ac./'
-        if test "$module" = 'alloca' && test -n "$libtool; then
+        if test "$module" = 'alloca' && test -n "$libtool"; then
           echo 'changequote(,)dnl'
           echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo 
/g;s/\.[^.]*$/.lo/'"'"'`'
           echo 'changequote([, ])dnl'