Minor fixes

1 files changed, 4 insertions, 3 deletions

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d4f223d..d025457 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -39,25 +39,25 @@ usage() {
  --cvs-auth=METHOD            Set the CVS access method used for downloading
                               gnulib files. METHOD is one of the keywords
                               accepted by cvs -d option (see info cvs
                               repository).
  --cvs-user=USERNAME          Set the CVS username to be used when accessing
                               the gnulib repository.
 
 The following two options are reserved for future use:
 			      
  --no-po                      Do not download po files.
  --update-po[=LANG]           Update po file(s) and exit.
 
-If the file `.bootstrap' exists in the current working directory, its
+If the file \`.bootstrap' exists in the current working directory, its
 contents is read, comments and empty lines removed, shell variables expanded
 and the result is prepended to the command line options.
 
 Running without arguments will suffice in most cases. It is equivalent
 to
 
     ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
 
 EOF
 }
 
 update_po() {
@@ -230,45 +230,46 @@ for file in build-aux/*.m4; do
   rm -f $dest &&
   echo "$0: Copying file $file" &&
   cp -p $file $dest || exit
 done
 
 for gnulib_file in $gnulib_files; do
   case $gnulib_file in
   config/*) dest=`echo $gnulib_file | sed 's,config/,build-aux/,'`;;
   # These will be overwritten by autopoint, which still uses
   # old jm_.* macro names, so we have to keep both copies.
   m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \
   m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \
-  m4/ulonglong.m4)
+  m4/ulonglong.m4 | m4/longlong.m4)
            dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
   *)       dest=$gnulib_file;;
   esac
   rm -f $dest &&
   echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
 echo "$0: Creating m4/gnulib.m4"
 (echo "# This file is generated automatically. Please, do not edit."
  echo "#"
  echo "AC_DEFUN([cflow_GNULIB],["
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
     $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
  done | sed '/AM_GNU_GETTEXT/d'
  echo "])") > ./m4/gnulib.m4
 
 echo "$0: Creating lib/Makefile.am"
-(echo "# This file is generated automatically from lib/Makefile.am. Do not edit!"
+(echo "# -*- buffer-read-only: t -*- vi: set ro:"
+ echo "# This file is generated automatically from lib/Makefile.tmpl. Do not edit!"
  cat lib/Makefile.tmpl
 
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
     $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
  done | sed 's/lib_SOURCES/libcflow_a_SOURCES/g' ) > lib/Makefile.am
 
 # Get translations.
 if test "$DOWNLOAD_PO" = "yes"; then
   update_po
 fi