bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Bison uses Automake 1.5c; it should use Automake 1.6


From: Paul Eggert
Subject: Bison uses Automake 1.5c; it should use Automake 1.6
Date: Mon, 18 Mar 2002 14:19:41 -0800 (PST)

The Bison generated files use Automake 1.5c.  This causes problems on
my environment, since I'm running in POSIX 1003.1-2001 mode, and my
environment pedantically rejects non-portable constructs like 'head -1'.

Is it OK if I install this patch, to upgrade Bison to Automake 1.6?
I guess Akim will also need to upgrade to Automake 1.6, or his next
checkin will undo most of this.

2002-03-18  Paul Eggert  <address@hidden>

        * config/depcomp, config/install-sh: Upgrade to Automake 1.6.
        * Makefile, aclocal.m4, config/Makefile.in, lib/Mkaefile.in,
        m4/Makefile.in, src/Makefile.in: Regenerate with Automake 1.6.

diff -pur bison-1_29-branch/Makefile.in bison-1_29-branch-no-union/Makefile.in
--- bison-1_29-branch/Makefile.in       2002-03-18 10:09:02.132163000 -0800
+++ bison-1_29-branch-no-union/Makefile.in      2002-03-18 10:38:15.321161000 
-0800
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
diff -pur bison-1_29-branch/aclocal.m4 bison-1_29-branch-no-union/aclocal.m4
--- bison-1_29-branch/aclocal.m4        2002-01-28 11:04:59.709321000 -0800
+++ bison-1_29-branch-no-union/aclocal.m4       2002-03-18 10:35:01.516160000 
-0800
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.5c -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -131,14 +131,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5c"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.5c])])
+        [AM_AUTOMAKE_VERSION([1.6])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -570,7 +570,7 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -595,10 +595,10 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
 [for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
-  if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
-    dirpart=
+    continue
   fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
diff -pur bison-1_29-branch/config/Makefile.in 
bison-1_29-branch-no-union/config/Makefile.in
--- bison-1_29-branch/config/Makefile.in        2002-01-28 11:05:04.131321000 
-0800
+++ bison-1_29-branch-no-union/config/Makefile.in       2002-03-18 
10:38:22.895162000 -0800
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
diff -pur bison-1_29-branch/config/depcomp 
bison-1_29-branch-no-union/config/depcomp
--- bison-1_29-branch/config/depcomp    2002-01-28 11:05:04.631322000 -0800
+++ bison-1_29-branch-no-union/config/depcomp   2002-02-19 11:34:56.000000000 
-0800
@@ -324,7 +324,7 @@ makedepend)
   if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
diff -pur bison-1_29-branch/config/install-sh 
bison-1_29-branch-no-union/config/install-sh
--- bison-1_29-branch/config/install-sh 2001-07-18 06:30:34.000000000 -0700
+++ bison-1_29-branch-no-union/config/install-sh        2002-01-27 
14:16:25.000000000 -0800
@@ -109,7 +109,7 @@ then
        echo "install:  no input file specified"
        exit 1
 else
-       true
+       :
 fi
 
 if [ x"$dir_arg" != x ]; then
@@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then
                instcmd=:
                chmodcmd=""
        else
-               instcmd=mkdir
+               instcmd=$mkdirprog
        fi
 else
 
@@ -130,7 +130,7 @@ else
 
        if [ -f $src -o -d $src ]
        then
-               true
+               :
        else
                echo "install:  $src does not exist"
                exit 1
@@ -141,7 +141,7 @@ else
                echo "install:  no destination specified"
                exit 1
        else
-               true
+               :
        fi
 
 # If destination is a directory, append the input filename; if your system
@@ -151,7 +151,7 @@ else
        then
                dst="$dst"/`basename $src`
        else
-               true
+               :
        fi
 fi
 
@@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='   
-'
+defaultIFS='
+       '
 IFS="${IFS-${defaultIFS}}"
 
 oIFS="${IFS}"
@@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
                $mkdirprog "${pathcomp}"
        else
-               true
+               :
        fi
 
        pathcomp="${pathcomp}/"
@@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
        $doit $instcmd $dst &&
 
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
@@ -216,7 +216,7 @@ else
        then
                dstfile=`basename $dst`
        else
-               true
+               :
        fi
 
 # Make a temp file name in the proper directory.
@@ -235,10 +235,10 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
 
 # Now rename the file to the real destination.
 
diff -pur bison-1_29-branch/lib/Makefile.in 
bison-1_29-branch-no-union/lib/Makefile.in
--- bison-1_29-branch/lib/Makefile.in   2002-01-28 11:05:08.073323000 -0800
+++ bison-1_29-branch-no-union/lib/Makefile.in  2002-03-18 10:41:03.756160000 
-0800
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
diff -pur bison-1_29-branch/m4/Makefile.in 
bison-1_29-branch-no-union/m4/Makefile.in
--- bison-1_29-branch/m4/Makefile.in    2002-01-28 11:05:08.435322000 -0800
+++ bison-1_29-branch-no-union/m4/Makefile.in   2002-03-18 10:41:56.820163000 
-0800
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
diff -pur bison-1_29-branch/src/Makefile.in 
bison-1_29-branch-no-union/src/Makefile.in
--- bison-1_29-branch/src/Makefile.in   2002-01-28 11:05:09.722321000 -0800
+++ bison-1_29-branch-no-union/src/Makefile.in  2002-03-18 10:41:15.916160000 
-0800
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5c from Makefile.am.
+# Makefile.in generated by automake 1.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -203,6 +204,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
          $(AUTOMAKE) --gnu  src/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -210,9 +212,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
          if test -f $$p \
          ; then \
+           p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
            f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(bindir)/$$f"; \
-          $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(bindir)/$$f; \
+          echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p 
$(DESTDIR)$(bindir)/$$f"; \
+          $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p 
$(DESTDIR)$(bindir)/$$f; \
          else :; fi; \
        done
 
@@ -220,6 +223,7 @@ uninstall-binPROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         f=`echo "$$f" | sed -e 's,^.*/,,'`; \
          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
          rm -f $(DESTDIR)$(bindir)/$$f; \
        done



reply via email to

[Prev in Thread] Current Thread [Next in Thread]